From ed7694d8cf4633da444237f4df7efc48936419d2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 16 Feb 2010 16:32:25 +0000 Subject: 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 . Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/avi.c') 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} }; -- cgit v1.2.3