summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-03 15:27:02 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-03 15:27:02 +0000
commitbc44b16cbab3906591c058dc8fed4974abdfcd36 (patch)
treecc6d2090d88d73820c1de2ce10b40d92020a8f9f /libmpdemux
parentc916485e1af2e89844546b0821bbd61685bbf023 (diff)
downloadmpv-bc44b16cbab3906591c058dc8fed4974abdfcd36.tar.bz2
mpv-bc44b16cbab3906591c058dc8fed4974abdfcd36.tar.xz
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
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c2
1 files changed, 2 insertions, 0 deletions
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;