diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-02-16 16:32:25 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-02-16 16:32:25 +0000 |
| commit | ed7694d8cf4633da444237f4df7efc48936419d2 (patch) | |
| tree | 6ceaa52216a94a3914e7978a8dc0f365e68458c7 /libavformat/avi.c | |
| parent | 114315994bc08812eeef51eaace455d86b5098d5 (diff) | |
| download | ffmpeg-ed7694d8cf4633da444237f4df7efc48936419d2.tar.gz | |
Set lavf identification string globally in av_write_header(), rather
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avi.c')
| -rw-r--r-- | libavformat/avi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avi.c b/libavformat/avi.c index a8980eb09c..705ad03ab0 100644 --- a/libavformat/avi.c +++ b/libavformat/avi.c @@ -40,6 +40,6 @@ const AVMetadataConv ff_avi_metadata_conv[] = { const char ff_avi_tags[][5] = { "IARL", "IART", "ICMS", "ICMT", "ICOP", "ICRD", "ICRP", "IDIM", "IDPI", "IENG", "IGNR", "IKEY", "ILGT", "ILNG", "IMED", "INAM", "IPLT", "IPRD", - "IPRT", "ISBJ",/*"ISFT"*/"ISHP", "ISRC", "ISRF", "ITCH", + "IPRT", "ISBJ", "ISFT", "ISHP", "ISRC", "ISRF", "ITCH", {0} }; |