Mercurial > mplayer.hg

changeset 29622:d5662ea3a5d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of reimplementing that functionality.
author reimar
date Tue, 08 Sep 2009 21:45:36 +0000
parents e3d04e77e1f3
children 7075d11f3535
files libmpdemux/demux_lavf.c libmpdemux/mp_taglists.c
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Tue Sep 08 21:42:51 2009 +0000
+++ b/libmpdemux/demux_lavf.c	Tue Sep 08 21:45:36 2009 +0000
@@ -242,8 +242,6 @@
             // 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;
--- a/libmpdemux/mp_taglists.c	Tue Sep 08 21:42:51 2009 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Sep 08 21:45:36 2009 +0000
@@ -58,6 +58,7 @@
 static const AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
     { CODEC_ID_AC3,               0x2000},
+    { CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A')},
     { CODEC_ID_DTS,               0x2001},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
     { CODEC_ID_H264,              MKTAG('H', '2', '6', '4')},