[MPlayer-cvslog] r34003 - trunk/libmpdemux/demux_lavf.c

[reimar]

Author: reimar
Date: Fri Aug 19 20:36:14 2011
New Revision: 34003

Log:
Do not believe a mp4v codec tag, go based on codec id instead in that case.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Thu Aug 18 21:20:50 2011	(r34002)
+++ trunk/libmpdemux/demux_lavf.c	Fri Aug 19 20:36:14 2011	(r34003)
@@ -363,6 +363,9 @@ static void handle_stream(demuxer_t *dem
                         codec->codec_tag= MKTAG(24, 'R', 'G', 'B');
                 }
             }
+            // mp4v is sometimes also used for files containing e.g. mjpeg
+            if(codec->codec_tag == MKTAG('m', 'p', '4', 'v'))
+                codec->codec_tag= 0;
             if(!codec->codec_tag)
                 codec->codec_tag= av_codec_get_tag(mp_bmp_taglists, codec->codec_id);
             bih->biSize= sizeof(*bih) + codec->extradata_size;