diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-28 01:07:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-28 01:07:11 +0100 |
| commit | 1e19927f12a2a65954aabf38b584025beff15cc3 (patch) | |
| tree | 33c88297cb164490ebe38b67cf353029d9fb83f2 /libavformat/avienc.c | |
| parent | ca55606a5127a9ddb10e4c1971c56e3e69bfd864 (diff) | |
| parent | 1f948745c3cbe45c4ccd5d8996fc885d826bf3ff (diff) | |
| download | ffmpeg-1e19927f12a2a65954aabf38b584025beff15cc3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: use an enum for Frame Coding Mode
doc: cleanup filter section
indeo3: error out if no motion vector is set.
x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.
mpegaudio: do not use init_static_data() for initializing tables.
musepack: fix signed shift overflow in mpc_read_packet()
mov: Make format string match variable type.
wmavoice: Make format string match variable type.
vc1: select interlaced scan table by FCM element
Generalize RIFF INFO tag support; support reading INFO tag in wav
pthread: track thread existence in a separate variable.
Conflicts:
doc/filters.texi
libavcodec/pthread.c
libavformat/avi.c
libavformat/riff.c
libavformat/riff.h
libavformat/wav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index b4dc65c243..583305073f 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -378,9 +378,9 @@ static int avi_write_header(AVFormatContext *s) list2 = ff_start_tag(pb, "LIST"); ffio_wfourcc(pb, "INFO"); - ff_metadata_conv(&s->metadata, ff_avi_metadata_conv, NULL); - for (i = 0; *ff_avi_tags[i]; i++) { - if ((t = av_dict_get(s->metadata, ff_avi_tags[i], NULL, AV_DICT_MATCH_CASE))) + ff_metadata_conv(&s->metadata, ff_riff_info_conv, NULL); + for (i = 0; *ff_riff_tags[i]; i++) { + if ((t = av_dict_get(s->metadata, ff_riff_tags[i], NULL, AV_DICT_MATCH_CASE))) avi_write_info_tag(s->pb, t->key, t->value); } ff_end_tag(pb, list2); |