Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 24674:f6cf2c01315d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Format 0x01 cannot be used with "AMV IMA ADPCM", because it belongs to normal PCM. Make lavf demuxer set codec tag to AMVA in this case. No need to use -ac +ffadpcmimaamva anymore.
author voroshil
date Wed, 03 Oct 2007 15:27:02 +0000
parents 46dbc2e8c800
children cc80a9169d90
comparison
equal deleted inserted replaced
24673:0dd1b48af82c 24674:f6cf2c01315d
328 priv->astreams[priv->audio_streams] = i; 328 priv->astreams[priv->audio_streams] = i;
329 priv->audio_streams++; 329 priv->audio_streams++;
330 // mp4a tag is used for all mp4 files no matter what they actually contain 330 // mp4a tag is used for all mp4 files no matter what they actually contain
331 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a')) 331 if(codec->codec_tag == MKTAG('m', 'p', '4', 'a'))
332 codec->codec_tag= 0; 332 codec->codec_tag= 0;
333 if(codec->codec_id == CODEC_ID_ADPCM_IMA_AMV)
334 codec->codec_tag= MKTAG('A','M','V','A');
333 if(!codec->codec_tag) 335 if(!codec->codec_tag)
334 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id); 336 codec->codec_tag= av_codec_get_tag(mp_wav_taglists, codec->codec_id);
335 wf->wFormatTag= codec->codec_tag; 337 wf->wFormatTag= codec->codec_tag;
336 wf->nChannels= codec->channels; 338 wf->nChannels= codec->channels;
337 wf->nSamplesPerSec= codec->sample_rate; 339 wf->nSamplesPerSec= codec->sample_rate;