Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 29551:19fa7aedb519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect that it now can be used for both audio and video.
author cehoyos
date Sun, 30 Aug 2009 23:01:36 +0000
parents 02a57b19fb92
children 7386b883fba6
comparison
equal deleted inserted replaced
29550:0105eab3f1a1 29551:19fa7aedb519
219 static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { 219 static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
220 lavf_priv_t *priv= demuxer->priv; 220 lavf_priv_t *priv= demuxer->priv;
221 AVStream *st= avfc->streams[i]; 221 AVStream *st= avfc->streams[i];
222 AVCodecContext *codec= st->codec; 222 AVCodecContext *codec= st->codec;
223 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0); 223 AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0);
224 int g, override_tag = av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); 224 int g, override_tag = av_codec_get_tag(mp_codecid_override_taglists,
225 codec->codec_id);
225 // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag 226 // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag
226 if (override_tag) 227 if (override_tag)
227 codec->codec_tag = override_tag; 228 codec->codec_tag = override_tag;
228 229
229 switch(codec->codec_type){ 230 switch(codec->codec_type){