Mercurial > mplayer.hg

changeset 33915:82b5070214cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not believe a mp4v codec tag, go based on codec id instead in that case.
author reimar
date Fri, 19 Aug 2011 18:36:14 +0000
parents 9ed8b7b1b94a
children 7941d02c012b
files libmpdemux/demux_lavf.c
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Thu Aug 18 19:20:50 2011 +0000
+++ b/libmpdemux/demux_lavf.c	Fri Aug 19 18:36:14 2011 +0000
@@ -363,6 +363,9 @@
                         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;