diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 00:43:45 +0100 |
| commit | bf2f93cdbf15c96c62b5112c1ab7f8093177e508 (patch) | |
| tree | 02992eb3142695332689898d713bef0653f3aa32 /libavformat/riff.c | |
| parent | b473c9937ebe9aafef9d2e07f080fb12ecc53ef4 (diff) | |
| parent | 28c8e288fa0342fdef532a7522a4707bebf831cc (diff) | |
Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'
* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
x86: h264_chromamc: port to cpuflags
yop: fix typo
avconv: fix copying per-stream metadata.
doc: avtools-common-opts: Fix terminology concerning metric prefixes
configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
riff: Make ff_riff_tags static and move under appropriate #ifdef
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index bae7f8aea0..0cb1694d88 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -417,13 +417,6 @@ const AVMetadataConv ff_riff_info_conv[] = { { 0 }, }; -const char ff_riff_tags[][5] = { - "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", - "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD", - "IPRT", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH", - {0} -}; - #if CONFIG_MUXERS int64_t ff_start_tag(AVIOContext *pb, const char *tag) { @@ -640,12 +633,19 @@ void ff_riff_write_info_tag(AVIOContext *pb, const char *tag, const char *str) } } +static const char riff_tags[][5] = { + "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", + "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD", + "IPRT", "ISBJ", "ISFT", "ISHP", "ISMP", "ISRC", "ISRF", "ITCH", + {0} +}; + static int riff_has_valid_tags(AVFormatContext *s) { int i; - for (i = 0; *ff_riff_tags[i]; i++) { - if (av_dict_get(s->metadata, ff_riff_tags[i], NULL, AV_DICT_MATCH_CASE)) + for (i = 0; *riff_tags[i]; i++) { + if (av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE)) return 1; } @@ -667,8 +667,8 @@ void ff_riff_write_info(AVFormatContext *s) list_pos = ff_start_tag(pb, "LIST"); ffio_wfourcc(pb, "INFO"); - for (i = 0; *ff_riff_tags[i]; i++) { - if ((t = av_dict_get(s->metadata, ff_riff_tags[i], NULL, AV_DICT_MATCH_CASE))) + for (i = 0; *riff_tags[i]; i++) { + if ((t = av_dict_get(s->metadata, riff_tags[i], NULL, AV_DICT_MATCH_CASE))) ff_riff_write_info_tag(s->pb, t->key, t->value); } ff_end_tag(pb, list_pos); |