]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Cosmetics after last commit
authoralexc <alexc@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 13 May 2009 17:59:46 +0000 (17:59 +0000)
committeralexc <alexc@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Wed, 13 May 2009 17:59:46 +0000 (17:59 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18816 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/aac_ac3_parser.c

index 90cbb9535c1a7c64f721a0a1e3f39783d17b58cf..85993c09b7675687b68d6a72215b0eadc89ccba9 100644 (file)
@@ -83,11 +83,9 @@ get_next:
             (avctx->codec_id == CODEC_ID_AC3 ||
              avctx->codec_id == CODEC_ID_EAC3)))) {
         avctx->channels = avctx->request_channels;
-    } else {
-        if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
+    } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
         avctx->channels = s->channels;
         avctx->channel_layout = s->channel_layout;
-        }
     }
     avctx->bit_rate = s->bit_rate;
     avctx->frame_size = s->samples;