Mercurial > mplayer.hg

changeset 24674:f6cf2c01315d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Format 0x01 cannot be used with "AMV IMA ADPCM", because it belongs to normal PCM. Make lavf demuxer set codec tag to AMVA in this case. No need to use -ac +ffadpcmimaamva anymore.
author voroshil
date Wed, 03 Oct 2007 15:27:02 +0000
parents 0dd1b48af82c
children ab0d7b969e86
files libmpdemux/demux_lavf.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Wed Oct 03 14:13:11 2007 +0000
+++ b/libmpdemux/demux_lavf.c	Wed Oct 03 15:27:02 2007 +0000
@@ -330,6 +330,8 @@
             // 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;