From bc44b16cbab3906591c058dc8fed4974abdfcd36 Mon Sep 17 00:00:00 2001
From: voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 3 Oct 2007 15:27:02 +0000
Subject: [PATCH] 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.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24694 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_lavf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 7f54d93812..07c2301705 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -330,6 +330,8 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
             // 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;