# HG changeset patch # User reimar # Date 1271795041 0 # Node ID b7040d2985793c006d15a39f0386daad75c6919e # Parent 591ab361a13111963430fbd743639f9003d518d9 Cosmetics/indentation fixes. diff -r 591ab361a131 -r b7040d298579 libmpcodecs/ad_ffmpeg.c --- a/libmpcodecs/ad_ffmpeg.c Tue Apr 20 20:22:49 2010 +0000 +++ b/libmpcodecs/ad_ffmpeg.c Tue Apr 20 20:24:01 2010 +0000 @@ -146,15 +146,16 @@ if(sh_audio->wf){ // If the decoder uses the wrong number of channels all is lost anyway. // sh_audio->channels=sh_audio->wf->nChannels; + if (lavc_context->codec_id == CODEC_ID_AAC && sh_audio->samplerate == 2*sh_audio->wf->nSamplesPerSec) { mp_msg(MSGT_DECAUDIO, MSGL_WARN, "Ignoring broken container sample rate for ACC with SBR\n"); - } else - if (sh_audio->wf->nSamplesPerSec) - sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; + } else if (sh_audio->wf->nSamplesPerSec) + sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; + if (sh_audio->wf->nAvgBytesPerSec) - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; + sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; } sh_audio->samplesize=af_fmt2bits(sh_audio->sample_format)/ 8; return 1;