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

[voroshil]

Author: voroshil
Date: Wed Oct  3 17:27:02 2007
New Revision: 24694

Log:
Format 0x01 can not be used with "AMV IMA ADPCM", because it belongs to normal PCM.
Make lavf demuxer setting codec tag to AMVA in this case.
No need in -ac +ffadpcmimaamva anymore.




Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Wed Oct  3 17:27:02 2007
@@ -330,6 +330,8 @@ static demuxer_t* demux_open_lavf(demuxe
             // mp4a tag is used for all mp4 files no matter what they actually contain
             if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
                 codec->codec_tag= 0;
+            if(codec->codec_id == CODEC_ID_ADPCM_IMA_AMV)
+                codec->codec_tag= MKTAG('A','M','V','A');
             if(!codec->codec_tag)
                 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
             wf->wFormatTag= codec->codec_tag;