summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_lavf.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-08 21:45:36 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-08 21:45:36 +0000
commit873d1203474a9bc917df324e404b87d8b4266330 (patch)
treeb8ad5f4c28f984c930d0ef3c131145aa6a28657f /libmpdemux/demux_lavf.c
parent1ea5135f6fa36b9b25438787ac5d3d1f92dccc2d (diff)
downloadmpv-873d1203474a9bc917df324e404b87d8b4266330.tar.bz2
mpv-873d1203474a9bc917df324e404b87d8b4266330.tar.xz
Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of
reimplementing that functionality. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_lavf.c')
-rw-r--r--libmpdemux/demux_lavf.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index cf38ab41d7..5d4444a774 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -242,8 +242,6 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
// 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;