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.

diff --git a/avplay.c b/avplay.c
index c01e446ab064f0e544c33f768fb5d02dfec943a2..e9389ffe65e529a4e0cd4c57560dab3f9adf5eca 100644 (file)
--- a/avplay.c
+++ b/avplay.c
@@ -2608,13 +2608,13 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
 
 static void toggle_full_screen(void)
 {
 
 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 */
 #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;
         cur_stream->pictq[i].reallocate = 1;

-    }

 #endif
 #endif

+    is_full_screen = !is_full_screen;

     video_open(cur_stream);
 }
 
     video_open(cur_stream);
 }
 

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 88d8ade57e32696679c244be28803152bc187aee..c7edb9ec819e6dbfcbab91bcd62b7a996f083d1a 100644 (file)
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -865,6 +865,7 @@ error:
 
 void ff_thread_flush(AVCodecContext *avctx)
 {
 
 void ff_thread_flush(AVCodecContext *avctx)
 {

+    int i;

     FrameThreadContext *fctx = avctx->thread_opaque;
 
     if (!avctx->thread_opaque) return;
     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;
     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;
         PerThreadContext *p = &fctx->threads[i];
         // Make sure decode flush calls with size=0 won't return old frames
         p->got_frame = 0;

diff --git a/libavdevice/dv1394.h b/libavdevice/dv1394.h
index 5ccc68a2597417642540c769d0119fc181f254d0..fc4df2403299c68b29daa15d42f7728d32a16486 100644 (file)
--- a/libavdevice/dv1394.h
+++ b/libavdevice/dv1394.h
@@ -175,7 +175,8 @@
          if(status.dropped_frames > 0) {
               reset_dv1394();
          } else {
          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();
               }
          }
                   copy_DV_frame();
               }
          }