]> git.sesse.net Git - ffmpeg/commitdiff
g722dec: cosmetics: reindent/linewrap
authorJustin Ruggles <justin.ruggles@gmail.com>
Sun, 23 Oct 2011 17:02:04 +0000 (13:02 -0400)
committerJustin Ruggles <justin.ruggles@gmail.com>
Tue, 25 Oct 2011 15:30:50 +0000 (11:30 -0400)
libavcodec/g722dec.c

index d2d2a48c3444edb435d3e1520912005f8a15307b..9330fea3ceaa504a5092d7e1182fb7b122bf57b3 100644 (file)
@@ -105,24 +105,22 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
 
         ff_g722_update_low_predictor(&c->band[0], ilow >> (2 - skip));
 
-            dhigh = c->band[1].scale_factor *
-                    ff_g722_high_inv_quant[ihigh] >> 10;
-            rhigh = av_clip(dhigh + c->band[1].s_predictor, -16384, 16383);
-
-            ff_g722_update_high_predictor(&c->band[1], dhigh, ihigh);
-
-            c->prev_samples[c->prev_samples_pos++] = rlow + rhigh;
-            c->prev_samples[c->prev_samples_pos++] = rlow - rhigh;
-            ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24,
-                              &xout1, &xout2);
-            out_buf[out_len++] = av_clip_int16(xout1 >> 12);
-            out_buf[out_len++] = av_clip_int16(xout2 >> 12);
-            if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) {
-                memmove(c->prev_samples,
-                        c->prev_samples + c->prev_samples_pos - 22,
-                        22 * sizeof(c->prev_samples[0]));
-                c->prev_samples_pos = 22;
-            }
+        dhigh = c->band[1].scale_factor * ff_g722_high_inv_quant[ihigh] >> 10;
+        rhigh = av_clip(dhigh + c->band[1].s_predictor, -16384, 16383);
+
+        ff_g722_update_high_predictor(&c->band[1], dhigh, ihigh);
+
+        c->prev_samples[c->prev_samples_pos++] = rlow + rhigh;
+        c->prev_samples[c->prev_samples_pos++] = rlow - rhigh;
+        ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24,
+                          &xout1, &xout2);
+        out_buf[out_len++] = av_clip_int16(xout1 >> 12);
+        out_buf[out_len++] = av_clip_int16(xout2 >> 12);
+        if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) {
+            memmove(c->prev_samples, c->prev_samples + c->prev_samples_pos - 22,
+                    22 * sizeof(c->prev_samples[0]));
+            c->prev_samples_pos = 22;
+        }
     }
     *data_size = out_len << 1;
     return avpkt->size;