Commit d246c18e authored by Diego Biurrun's avatar Diego Biurrun

Avoid C99 variable declarations within for statements.

We generally do not declare variables within for statements and
there are compilers that choke on such constructs.
parent 7dc747f5
......@@ -2608,13 +2608,13 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
static void toggle_full_screen(void)
{
is_full_screen = !is_full_screen;
#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
/* OS X needs to empty the picture_queue */
for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
int i;
for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++)
cur_stream->pictq[i].reallocate = 1;
}
#endif
is_full_screen = !is_full_screen;
video_open(cur_stream);
}
......
......@@ -865,6 +865,7 @@ error:
void ff_thread_flush(AVCodecContext *avctx)
{
int i;
FrameThreadContext *fctx = avctx->thread_opaque;
if (!avctx->thread_opaque) return;
......@@ -880,7 +881,7 @@ void ff_thread_flush(AVCodecContext *avctx)
fctx->next_decoding = fctx->next_finished = 0;
fctx->delaying = 1;
fctx->prev_thread = NULL;
for (int i = 0; i < avctx->thread_count; i++) {
for (i = 0; i < avctx->thread_count; i++) {
PerThreadContext *p = &fctx->threads[i];
// Make sure decode flush calls with size=0 won't return old frames
p->got_frame = 0;
......
......@@ -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();
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment