mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
f9ecb849ef
* qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
101 lines
3.1 KiB
C
101 lines
3.1 KiB
C
/*
|
|
* copyright (c) 2009 Michael Niedermayer
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <strings.h>
|
|
#include "avformat.h"
|
|
#include "metadata.h"
|
|
#include "libavutil/dict.h"
|
|
|
|
#if FF_API_OLD_METADATA2
|
|
AVDictionaryEntry *
|
|
av_metadata_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags)
|
|
{
|
|
return av_dict_get(m, key, prev, flags);
|
|
}
|
|
|
|
int av_metadata_set2(AVDictionary **pm, const char *key, const char *value, int flags)
|
|
{
|
|
return av_dict_set(pm, key, value, flags);
|
|
}
|
|
|
|
void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
|
|
const AVMetadataConv *s_conv)
|
|
{
|
|
return;
|
|
}
|
|
|
|
void av_metadata_free(AVDictionary **pm)
|
|
{
|
|
av_dict_free(pm);
|
|
}
|
|
|
|
void av_metadata_copy(AVDictionary **dst, AVDictionary *src, int flags)
|
|
{
|
|
av_dict_copy(dst, src, flags);
|
|
}
|
|
#endif
|
|
|
|
void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
|
|
const AVMetadataConv *s_conv)
|
|
{
|
|
/* TODO: use binary search to look up the two conversion tables
|
|
if the tables are getting big enough that it would matter speed wise */
|
|
const AVMetadataConv *sc, *dc;
|
|
AVDictionaryEntry *mtag = NULL;
|
|
AVDictionary *dst = NULL;
|
|
const char *key;
|
|
|
|
if (d_conv == s_conv)
|
|
return;
|
|
|
|
while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) {
|
|
key = mtag->key;
|
|
if (s_conv)
|
|
for (sc=s_conv; sc->native; sc++)
|
|
if (!strcasecmp(key, sc->native)) {
|
|
key = sc->generic;
|
|
break;
|
|
}
|
|
if (d_conv)
|
|
for (dc=d_conv; dc->native; dc++)
|
|
if (!strcasecmp(key, dc->generic)) {
|
|
key = dc->native;
|
|
break;
|
|
}
|
|
av_dict_set(&dst, key, mtag->value, 0);
|
|
}
|
|
av_dict_free(pm);
|
|
*pm = dst;
|
|
}
|
|
|
|
void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
|
|
const AVMetadataConv *s_conv)
|
|
{
|
|
int i;
|
|
ff_metadata_conv(&ctx->metadata, d_conv, s_conv);
|
|
for (i=0; i<ctx->nb_streams ; i++)
|
|
ff_metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv);
|
|
for (i=0; i<ctx->nb_chapters; i++)
|
|
ff_metadata_conv(&ctx->chapters[i]->metadata, d_conv, s_conv);
|
|
for (i=0; i<ctx->nb_programs; i++)
|
|
ff_metadata_conv(&ctx->programs[i]->metadata, d_conv, s_conv);
|
|
}
|
|
|