[xiph-commits] r12153 - trunk/ffmpeg2theora

[conrad at svn.xiph.org]

Author: conrad
Date: 2006-11-28 17:55:47 -0800 (Tue, 28 Nov 2006)
New Revision: 12153

Modified:
   trunk/ffmpeg2theora/ffmpeg2theora.c
   trunk/ffmpeg2theora/theorautils.c
Log:
Removed C99-style delayed declarations to allow building with GCC 2.95.4 (!)
Reported by Jaakko Manninen, for http://www.tpolm.com/


Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2006-11-28 23:24:02 UTC (rev 12152)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2006-11-29 01:55:47 UTC (rev 12153)
@@ -619,6 +619,7 @@
                 }
                 while(e_o_s || len > 0){
                     int dups = 0;
+                    yuv_buffer yuv;
                     len1 = avcodec_decode_video(vstream->codec, frame, &got_picture, ptr, len);
                     if(len1>=0) {
                                         
@@ -709,7 +710,6 @@
                     //now output_resized
 
                     /* pysical pages */
-                    yuv_buffer yuv;
                     yuv.y_width = this->frame_width;
                     yuv.y_height = this->frame_height;
                     yuv.y_stride = output_resized->linesize[0];

Modified: trunk/ffmpeg2theora/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/theorautils.c	2006-11-28 23:24:02 UTC (rev 12152)
+++ trunk/ffmpeg2theora/theorautils.c	2006-11-29 01:55:47 UTC (rev 12153)
@@ -293,6 +293,8 @@
     }
 
     if (info->with_skeleton) {
+	int result;
+
         /* build and add the e_o_s packet */
 	memset (&op, 0, sizeof (op));
         op.b_o_s = 0;
@@ -301,7 +303,7 @@
 	op.bytes = 0; /* e_o_s packet is an empty packet */
         ogg_stream_packetin (&info->so, &op);
 
-	int result = ogg_stream_flush (&info->so, &og);
+	result = ogg_stream_flush (&info->so, &og);
         if (result < 0){
             /* can't get here */
             fprintf (stderr, "Internal Ogg library error.\n");