libavformat/asfdec.c | 3 ++-
libavformat/avformat.h | 1 +
libavformat/id3v2.c | 16 +++++++++++-----
libavformat/matroskadec.c | 4 +++-
libavformat/metadata.c | 4 ++++
libavformat/oggparsevorbis.c | 3 ++-
libavformat/options_table.h | 1 +
libavformat/wtvdec.c | 3 ++-
8 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 978b956..e80e1d3 100644
|
a
|
b
|
static int asf_read_header(AVFormatContext *s)
|
| 862 | 862 | } |
| 863 | 863 | } |
| 864 | 864 | |
| 865 | | ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv); |
| | 865 | if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) |
| | 866 | ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv); |
| 866 | 867 | |
| 867 | 868 | return 0; |
| 868 | 869 | } |
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7551f7b..5b908e4 100644
|
a
|
b
|
typedef struct AVFormatContext {
|
| 1294 | 1294 | #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) |
| 1295 | 1295 | #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted) |
| 1296 | 1296 | #define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate. |
| | 1297 | #define AVFMT_FLAG_NO_META_CONV 0x80000 ///< Don't convert metadata field names. |
| 1297 | 1298 | |
| 1298 | 1299 | /** |
| 1299 | 1300 | * @deprecated deprecated in favor of probesize2 |
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index fb89e83..5a3aab7 100644
|
a
|
b
|
static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *tta
|
| 574 | 574 | len -= taglen; |
| 575 | 575 | } |
| 576 | 576 | |
| 577 | | ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_34_metadata_conv); |
| 578 | | ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_4_metadata_conv); |
| | 577 | if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) { |
| | 578 | ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_34_metadata_conv); |
| | 579 | ff_metadata_conv(&chapter->metadata, NULL, ff_id3v2_4_metadata_conv); |
| | 580 | } |
| 579 | 581 | end: |
| 580 | 582 | av_free(dst); |
| 581 | 583 | } |
| … |
… |
static void id3v2_read_internal(AVIOContext *pb, AVDictionary **metadata,
|
| 916 | 918 | avio_seek(pb, off, SEEK_SET); |
| 917 | 919 | } |
| 918 | 920 | } while (found_header); |
| 919 | | ff_metadata_conv(metadata, NULL, ff_id3v2_34_metadata_conv); |
| 920 | | ff_metadata_conv(metadata, NULL, id3v2_2_metadata_conv); |
| 921 | | ff_metadata_conv(metadata, NULL, ff_id3v2_4_metadata_conv); |
| | 921 | |
| | 922 | if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) { |
| | 923 | ff_metadata_conv(metadata, NULL, ff_id3v2_34_metadata_conv); |
| | 924 | ff_metadata_conv(metadata, NULL, id3v2_2_metadata_conv); |
| | 925 | ff_metadata_conv(metadata, NULL, ff_id3v2_4_metadata_conv); |
| | 926 | } |
| | 927 | |
| 922 | 928 | merge_date(metadata); |
| 923 | 929 | } |
| 924 | 930 | |
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 50b75e7..72655f0 100644
|
a
|
b
|
static void matroska_convert_tag(AVFormatContext *s, EbmlList *list,
|
| 1377 | 1377 | matroska_convert_tag(s, &tags[i].sub, metadata, key); |
| 1378 | 1378 | } |
| 1379 | 1379 | } |
| 1380 | | ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv); |
| | 1380 | |
| | 1381 | if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) |
| | 1382 | ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv); |
| 1381 | 1383 | } |
| 1382 | 1384 | |
| 1383 | 1385 | static void matroska_convert_tags(AVFormatContext *s) |
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index b9b6de7..a9f68cd 100644
|
a
|
b
|
void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
|
| 60 | 60 | const AVMetadataConv *s_conv) |
| 61 | 61 | { |
| 62 | 62 | int i; |
| | 63 | |
| | 64 | if ( !(ctx->flags & AVFMT_FLAG_NO_META_CONV) ) |
| | 65 | return; |
| | 66 | |
| 63 | 67 | ff_metadata_conv(&ctx->metadata, d_conv, s_conv); |
| 64 | 68 | for (i=0; i<ctx->nb_streams ; i++) |
| 65 | 69 | ff_metadata_conv(&ctx->streams [i]->metadata, d_conv, s_conv); |
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 8103d9d..1ad23b0 100644
|
a
|
b
|
int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
|
| 176 | 176 | av_log(as, AV_LOG_INFO, |
| 177 | 177 | "truncated comment header, %i comments not found\n", n); |
| 178 | 178 | |
| 179 | | ff_metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv); |
| | 179 | if ( !(as->flags & AVFMT_FLAG_NO_META_CONV) ) |
| | 180 | ff_metadata_conv(m, NULL, ff_vorbiscomment_metadata_conv); |
| 180 | 181 | |
| 181 | 182 | return 0; |
| 182 | 183 | } |
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index 94cd65c..2b44fee 100644
|
a
|
b
|
static const AVOption avformat_options[] = {
|
| 46 | 46 | {"nofillin", "do not fill in missing values that can be exactly calculated", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOFILLIN }, INT_MIN, INT_MAX, D, "fflags"}, |
| 47 | 47 | {"noparse", "disable AVParsers, this needs nofillin too", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOPARSE }, INT_MIN, INT_MAX, D, "fflags"}, |
| 48 | 48 | {"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, |
| | 49 | {"nometaconv", "skip conversion of metadata field names", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NO_META_CONV }, INT_MIN, INT_MAX, D, "fflags"}, |
| 49 | 50 | {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, |
| 50 | 51 | {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, |
| 51 | 52 | {"keepside", "don't merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, |
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index cfdc555..1ceecd5 100644
|
a
|
b
|
static void parse_legacy_attrib(AVFormatContext *s, AVIOContext *pb)
|
| 549 | 549 | get_tag(s, pb, key, type, length); |
| 550 | 550 | } |
| 551 | 551 | |
| 552 | | ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv); |
| | 552 | if ( !(s->flags & AVFMT_FLAG_NO_META_CONV) ) |
| | 553 | ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv); |
| 553 | 554 | } |
| 554 | 555 | |
| 555 | 556 | /** |