[FFmpeg-devel] [PATCH 2/3] adpcm_dtk: Reindent after last commit

James Almer jamrial at gmail.com
Mon May 13 00:47:15 CEST 2013


Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavcodec/adpcm.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index fd636d9..a9ce4d8 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1420,17 +1420,17 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
 
         smp[0] = samples_p[0];
         smp[1] = samples_p[1];
-            for (i = 0; i < nb_samples / 28; i++) {
-                int byte, header[2];
-                header[0] = bytestream2_get_byteu(&gb);
-                header[1] = bytestream2_get_byteu(&gb);
-                bytestream2_skipu(&gb, 2);
+        for (i = 0; i < nb_samples / 28; i++) {
+            int byte, header[2];
+            header[0] = bytestream2_get_byteu(&gb);
+            header[1] = bytestream2_get_byteu(&gb);
+            bytestream2_skipu(&gb, 2);
 
-                /* Decode 28 samples.  */
-                for (n = 0; n < 28; n++) {
-                    int32_t sampledat[2], prev[2];
+            /* Decode 28 samples.  */
+            for (n = 0; n < 28; n++) {
+                int32_t sampledat[2], prev[2];
 
-                    for (channel = 0; channel < avctx->channels; channel++) {
+                for (channel = 0; channel < avctx->channels; channel++) {
                     switch (header[channel] >> 4) {
                     case 1:
                         prev[channel] = (c->status[channel].sample1 * 0x3c);
@@ -1448,18 +1448,18 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
                     }
 
                     prev[channel] = av_clip((prev[channel] + 0x20) >> 6, -0x200000, 0x1fffff);
-                    }
+                }
 
-                    byte = bytestream2_get_byteu(&gb);
-                    for (channel = 0; channel < avctx->channels; channel++) {
-                        sampledat[channel] = (((sign_extend(channel ? byte >> 4 : byte, 4) << 12) 
-                                             >> (header[channel] & 0xf)) << 6) + prev[channel];
-                        *smp[channel]++ = av_clip_int16(sampledat[channel] >> 6);
-                        c->status[channel].sample2 = c->status[channel].sample1;
-                        c->status[channel].sample1 = sampledat[channel];
-                    }
+                byte = bytestream2_get_byteu(&gb);
+                for (channel = 0; channel < avctx->channels; channel++) {
+                    sampledat[channel] = (((sign_extend(channel ? byte >> 4 : byte, 4) << 12) 
+                                         >> (header[channel] & 0xf)) << 6) + prev[channel];
+                    *smp[channel]++ = av_clip_int16(sampledat[channel] >> 6);
+                    c->status[channel].sample2 = c->status[channel].sample1;
+                    c->status[channel].sample1 = sampledat[channel];
                 }
             }
+        }
         break;
     }
     default:
-- 
1.8.1.msysgit.1




More information about the ffmpeg-devel mailing list