aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-07-27 16:14:33 +0100
committerMans Rullgard <mans@mansr.com>2011-07-27 16:36:02 +0100
commite72f3d10f64f5c65a67aa21dcc79a85ee55e912e (patch)
treea845d49a948f1ea6cbe77f4fcb22a670cbc70bcb
parentc358a0364e26ffcd8f5986a85997882e1c36eed2 (diff)
downloadffmpeg-e72f3d10f64f5c65a67aa21dcc79a85ee55e912e.tar.gz
dnxhdenc: fix declarations in for loops
Apparently the gcc warning doesn't trigger on these. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/dnxhdenc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 3fb10d4380..1a0c8ce02e 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -79,13 +79,14 @@ static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, DCTELEM *block,
const uint8_t *scantable= ctx->intra_scantable.scantable;
const int *qmat = ctx->q_intra_matrix[qscale];
int last_non_zero = 0;
+ int i;
ctx->dsp.fdct(block);
// Divide by 4 with rounding, to compensate scaling of DCT coefficients
block[0] = (block[0] + 2) >> 2;
- for (int i = 1; i < 64; ++i) {
+ for (i = 1; i < 64; ++i) {
int j = scantable[i];
int sign = block[j] >> 31;
int level = (block[j] ^ sign) - sign;
@@ -634,9 +635,10 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int jobnr, int
int sum = 0;
int sqsum = 0;
int mean, sqmean;
+ int i, j;
// Macroblocks are 16x16 pixels, unlike DCT blocks which are 8x8.
- for (int i = 0; i < 16; ++i) {
- for (int j = 0; j < 16; ++j) {
+ for (i = 0; i < 16; ++i) {
+ for (j = 0; j < 16; ++j) {
// Turn 16-bit pixels into 10-bit ones.
int const sample = (unsigned)pix[j] >> 6;
sum += sample;