[SCM] libav/experimental: Cosmetics: Re-indent after last commit.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:02:49 UTC 2013


The following commit has been merged in the experimental branch:
commit 65bec42e33dde457cbd7b9841c028460c0467b49
Author: Alex Converse <alex.converse at gmail.com>
Date:   Thu Mar 4 02:32:48 2010 +0000

    Cosmetics: Re-indent after last commit.
    
    Originally committed as revision 22195 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 83ad9c5..8791161 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -81,19 +81,19 @@ get_next:
     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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list