Mercurial > mplayer.hg

changeset 31010:b7040d298579

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics/indentation fixes.
author reimar
date Tue, 20 Apr 2010 20:24:01 +0000
parents 591ab361a131
children 464ce8f29abc
files libmpcodecs/ad_ffmpeg.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;