aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-13 21:01:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-13 21:08:43 +0100
commit16b771b1f47daa9fec84477040984d83a92ba4a6 (patch)
treee48b9580b9e342f26005a3e96bf430d39cb4d289
parentb39e01a6e887745192da8c105ffac1f297b00da9 (diff)
downloadffmpeg-16b771b1f47daa9fec84477040984d83a92ba4a6.tar.gz
cleanup: for(int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffplay.c3
-rw-r--r--libavcodec/proresenc.c10
-rw-r--r--libavdevice/dv1394.h3
-rw-r--r--libavfilter/transform.c9
4 files changed, 15 insertions, 10 deletions
diff --git a/ffplay.c b/ffplay.c
index c84dc2fd9a..e391754863 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2773,10 +2773,11 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
static void toggle_full_screen(VideoState *is)
{
+ int i;
is_full_screen = !is_full_screen;
#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
/* OS X needs to reallocate the SDL overlays */
- for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
+ for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
is->pictq[i].reallocate = 1;
}
#endif
diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index d27719d368..8cdcff3c49 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -234,10 +234,10 @@ static void encode_ac_coeffs(AVCodecContext *avctx, PutBitContext *pb,
int prev_run = 4;
int prev_level = 2;
- int run = 0, level, code;
- for (int i = 1; i < 64; i++) {
+ int run = 0, level, code, i, j;
+ for (i = 1; i < 64; i++) {
int indp = progressive_scan[i];
- for (int j = 0; j < blocks_per_slice; j++) {
+ for (j = 0; j < blocks_per_slice; j++) {
int val = QSCALE(qmat, indp, in[(j << 6) + indp]);
if (val) {
encode_codeword(pb, run, run_to_cb[FFMIN(prev_run, 15)]);
@@ -441,13 +441,13 @@ static int prores_encode_picture(AVCodecContext *avctx, AVFrame *pic,
{
int mb_width = (avctx->width + 15) >> 4;
int mb_height = (avctx->height + 15) >> 4;
- int hdr_size, sl_size;
+ int hdr_size, sl_size, i;
int mb_y, sl_data_size, qp;
int unsafe_bot, unsafe_right;
uint8_t *sl_data, *sl_data_sizes;
int slice_per_line = 0, rem = mb_width;
- for (int i = av_log2(DEFAULT_SLICE_MB_WIDTH); i >= 0; --i) {
+ for (i = av_log2(DEFAULT_SLICE_MB_WIDTH); i >= 0; --i) {
slice_per_line += rem >> i;
rem &= (1 << i) - 1;
}
diff --git a/libavdevice/dv1394.h b/libavdevice/dv1394.h
index 00706f7541..1bab0314c5 100644
--- a/libavdevice/dv1394.h
+++ b/libavdevice/dv1394.h
@@ -175,7 +175,8 @@
if(status.dropped_frames > 0) {
reset_dv1394();
} else {
- for(int i = 0; i < status.n_clear_frames; i++) {
+ int i;
+ for(i = 0; i < status.n_clear_frames; i++) {
copy_DV_frame();
}
}
diff --git a/libavfilter/transform.c b/libavfilter/transform.c
index 800f784446..8afc5fea6a 100644
--- a/libavfilter/transform.c
+++ b/libavfilter/transform.c
@@ -116,19 +116,22 @@ void avfilter_get_matrix(float x_shift, float y_shift, float angle, float zoom,
void avfilter_add_matrix(const float *m1, const float *m2, float *result)
{
- for (int i = 0; i < 9; i++)
+ int i;
+ for (i = 0; i < 9; i++)
result[i] = m1[i] + m2[i];
}
void avfilter_sub_matrix(const float *m1, const float *m2, float *result)
{
- for (int i = 0; i < 9; i++)
+ int i;
+ for (i = 0; i < 9; i++)
result[i] = m1[i] - m2[i];
}
void avfilter_mul_matrix(const float *m1, float scalar, float *result)
{
- for (int i = 0; i < 9; i++)
+ int i;
+ for (i = 0; i < 9; i++)
result[i] = m1[i] * scalar;
}