Mercurial > libavcodec.hg

changeset 11357:3b06c3d9e72d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: Re-indent after last commit.
author alexc
date Thu, 04 Mar 2010 02:32:48 +0000
parents 9056fd765255
children a1376a6f9af1
files aac_ac3_parser.c
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/aac_ac3_parser.c	Thu Mar 04 02:30:51 2010 +0000
+++ b/aac_ac3_parser.c	Thu Mar 04 02:32:48 2010 +0000
@@ -81,19 +81,19 @@
     if (avctx->codec_id != CODEC_ID_AAC) {
         avctx->sample_rate = s->sample_rate;
 
-    /* allow downmixing to stereo (or mono for AC-3) */
-    if(avctx->request_channels > 0 &&
-            avctx->request_channels < s->channels &&
-            (avctx->request_channels <= 2 ||
-            (avctx->request_channels == 1 &&
-            (avctx->codec_id == CODEC_ID_AC3 ||
-             avctx->codec_id == CODEC_ID_EAC3)))) {
-        avctx->channels = avctx->request_channels;
-    } else {
-        avctx->channels = s->channels;
-        avctx->channel_layout = s->channel_layout;
-    }
-    avctx->frame_size = s->samples;
+        /* allow downmixing to stereo (or mono for AC-3) */
+        if(avctx->request_channels > 0 &&
+                avctx->request_channels < s->channels &&
+                (avctx->request_channels <= 2 ||
+                (avctx->request_channels == 1 &&
+                (avctx->codec_id == CODEC_ID_AC3 ||
+                 avctx->codec_id == CODEC_ID_EAC3)))) {
+            avctx->channels = avctx->request_channels;
+        } else {
+            avctx->channels = s->channels;
+            avctx->channel_layout = s->channel_layout;
+        }
+        avctx->frame_size = s->samples;
     }
 
     avctx->bit_rate = s->bit_rate;