From 361bdec7ed486293993ca5c3a5700c1ce3153cc0 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sun, 30 Aug 2009 22:51:52 +0000 Subject: Use mp_wav_override_taglists for both audio and video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29590 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_lavf.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libmpdemux/demux_lavf.c') diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 886df7a1bf..3093b22d1e 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -221,11 +221,13 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { AVStream *st= avfc->streams[i]; AVCodecContext *codec= st->codec; AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0); - int g; + int g, override_tag = av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); + // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag + if (override_tag) + codec->codec_tag = override_tag; switch(codec->codec_type){ case CODEC_TYPE_AUDIO:{ - int override_tag; WAVEFORMATEX *wf; sh_audio_t* sh_audio; sh_audio=new_sh_audio(demuxer, i); @@ -235,10 +237,6 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { priv->astreams[priv->audio_streams] = i; priv->audio_streams++; wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); - // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag - override_tag= av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); - if (override_tag) - codec->codec_tag= override_tag; // 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; -- cgit v1.2.3