comparison libmpcodecs/ad_ffmpeg.c @ 31010:b7040d298579

Cosmetics/indentation fixes.

31009:591ab361a131

          return 0;
  }
  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;
      if (sh_audio->wf->nAvgBytesPerSec)
      sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
  }
  sh_audio->samplesize=af_fmt2bits(sh_audio->sample_format)/ 8;
  return 1;
}

31010:b7040d298579

          return 0;
  }
  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;

      if (sh_audio->wf->nAvgBytesPerSec)
          sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
  }
  sh_audio->samplesize=af_fmt2bits(sh_audio->sample_format)/ 8;
  return 1;
}