Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 22990:a76748e71a18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore mp4a audio tag, it is meaningless since we get it for all mp4 files regardless of actual audio codec.
author reimar
date Mon, 16 Apr 2007 20:08:29 +0000
parents 46593cc4aeba
children 74efb0fa8a0b
comparison
equal deleted inserted replaced
22989:682e1d6726f4 22990:a76748e71a18
307 sh_audio=new_sh_audio(demuxer, i); 307 sh_audio=new_sh_audio(demuxer, i);
308 if(!sh_audio) 308 if(!sh_audio)
309 break; 309 break;
310 priv->astreams[priv->audio_streams] = i; 310 priv->astreams[priv->audio_streams] = i;
311 priv->audio_streams++; 311 priv->audio_streams++;
312 // mp4a tag is used for all mp4 files no matter what they actually contain
313 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
314 codec->codec_tag= 0;
312 if(!codec->codec_tag) 315 if(!codec->codec_tag)
313 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); 316 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
314 wf->wFormatTag= codec->codec_tag; 317 wf->wFormatTag= codec->codec_tag;
315 wf->nChannels= codec->channels; 318 wf->nChannels= codec->channels;
316 wf->nSamplesPerSec= codec->sample_rate; 319 wf->nSamplesPerSec= codec->sample_rate;