comskip: fix C89 compatibility — move loop variable declarations before for statements

Author: eric

comskip.c

@@ -410,9 +410,12 @@ void add_cc_text(long start_frame, long end_frame, const char *text)
     cc_text[cc_text_count].text_len = strnlen(text, sizeof(cc_text[cc_text_count].text) - 1);
     strncpy((char*)cc_text[cc_text_count].text, text, sizeof(cc_text[cc_text_count].text) - 1);
     cc_text[cc_text_count].text[sizeof(cc_text[cc_text_count].text) - 1] = '\0';
-    // Replace newlines with spaces so the log stays line-oriented.
-    for (unsigned char *p = cc_text[cc_text_count].text; *p; p++)
-        if (*p == '\n' || *p == '\r') *p = ' ';
+    {
+        // Replace newlines with spaces so the log stays line-oriented.
+        unsigned char *p;
+        for (p = cc_text[cc_text_count].text; *p; p++)
+            if (*p == '\n' || *p == '\r') *p = ' ';
+    }
     cc_text_count++;
 }
 

mpeg2dec.c

@@ -648,17 +648,19 @@ void subtitle_packet_process(VideoState *is, AVPacket *packet)
         long sub_frame = (long)(sub_pts * is->fps);
 
         if (sub.num_rects > 0) {
-            for (unsigned i = 0; i < sub.num_rects; i++) {
+            unsigned i;
+            for (i = 0; i < sub.num_rects; i++) {
                 const char *text = NULL;
                 if (sub.rects[i]->text) {
                     text = sub.rects[i]->text;
                 } else if (sub.rects[i]->type == SUBTITLE_ASS && sub.rects[i]->ass) {
                     // FFmpeg's ff_ass_get_dialog produces:
                     //   readorder,layer,style,speaker,marginL,marginR,marginV,,text
                     // The text field follows the 8th comma.
-                    text = sub.rects[i]->ass;
+                    const char *p;
                     int commas = 0;
-                    for (const char *p = text; *p; p++) {
+                    text = sub.rects[i]->ass;
+                    for (p = text; *p; p++) {
                         if (*p == ',') {
                             commas++;
                             if (commas == 8) { text = p + 1; break; }