[MPlayer-cvslog] r29664 - in trunk/libmpdemux: demux_lavf.c mp_taglists.c

[reimar]

Author: reimar
Date: Tue Sep  8 23:45:36 2009
New Revision: 29664

Log:
Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead of
reimplementing that functionality.

Modified:
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Tue Sep  8 23:42:51 2009	(r29663)
+++ trunk/libmpdemux/demux_lavf.c	Tue Sep  8 23:45:36 2009	(r29664)
@@ -242,8 +242,6 @@ static void handle_stream(demuxer_t *dem
             // 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;

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Sep  8 23:42:51 2009	(r29663)
+++ trunk/libmpdemux/mp_taglists.c	Tue Sep  8 23:45:36 2009	(r29664)
@@ -58,6 +58,7 @@ const struct AVCodecTag * const mp_wav_t
 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')},