Mercurial > libavcodec.hg

changeset 9635:4d13e2e2503a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics after last commit
author alexc
date Wed, 13 May 2009 17:59:46 +0000
parents 61c62ab2218f
children 8e95c7402d1a
files aac_ac3_parser.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/aac_ac3_parser.c	Wed May 13 17:57:58 2009 +0000
+++ b/aac_ac3_parser.c	Wed May 13 17:59:46 2009 +0000
@@ -83,11 +83,9 @@
             (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;