[xiph-commits] r2949 - in liboggplay/trunk: plugin src/liboggplay

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-16 00:43:58 -0700 (Sat, 16 Jun 2007)
New Revision: 2949

Modified:
   liboggplay/trunk/plugin/Makefile.am
   liboggplay/trunk/plugin/plugin_gui_linux.c
   liboggplay/trunk/src/liboggplay/Makefile.am
Log:
Added -Wdeclaration-after-statement to makefiles.  Fixed resulting errors.



Modified: liboggplay/trunk/plugin/Makefile.am
===================================================================
--- liboggplay/trunk/plugin/Makefile.am	2007-06-16 07:36:28 UTC (rev 2948)
+++ liboggplay/trunk/plugin/Makefile.am	2007-06-16 07:43:58 UTC (rev 2949)
@@ -13,7 +13,7 @@
 			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS)
 AM_CFLAGS = -Wall -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
 			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) \
-	    $(IMLIB2_CFLAGS)
+	    $(IMLIB2_CFLAGS) -Wdeclaration-after-statement
 
 include $(srcdir)/Make-rules-$(PLATFORM)
 

Modified: liboggplay/trunk/plugin/plugin_gui_linux.c
===================================================================
--- liboggplay/trunk/plugin/plugin_gui_linux.c	2007-06-16 07:36:28 UTC (rev 2948)
+++ liboggplay/trunk/plugin/plugin_gui_linux.c	2007-06-16 07:43:58 UTC (rev 2949)
@@ -150,10 +150,12 @@
 
   get_oggplay_frame(info->ogg_handle, &frame_data);
   if (frame_data.video_data != NULL) {    
+    Imlib_Image image;
+
     convert_oggplay_frame(info->ogg_handle, &frame_data, BGR);
     /* display frame */
     //printf ("Got a frame to display\n");
-    Imlib_Image image = imlib_create_image_using_data(frame_data.width, 
+    image = imlib_create_image_using_data(frame_data.width, 
                     frame_data.height, (unsigned int *)frame_data.frame);
     imlib_context_set_image(image);
     imlib_render_image_on_drawable_at_size(0, 0, info->width, info->height);
@@ -255,6 +257,7 @@
 display_thread(void *_info) {
 
   PluginWindowInfo  * info = (PluginWindowInfo *)_info;
+  GdkVisual         * gvis;
 
   /*
    * construct a new toplevel window to draw into.  Make sure window is
@@ -264,7 +267,7 @@
   gtk_widget_realize(GTK_WIDGET(info->window));
 
   /* initialise imlib */
-  GdkVisual  *gvis = gdk_visual_get_system();
+  gvis = gdk_visual_get_system();
 
   imlib_context_set_display(GDK_WINDOW_XDISPLAY(info->window->window));
   imlib_context_set_drawable(GDK_WINDOW_XWINDOW(info->window->window));

Modified: liboggplay/trunk/src/liboggplay/Makefile.am
===================================================================
--- liboggplay/trunk/src/liboggplay/Makefile.am	2007-06-16 07:36:28 UTC (rev 2948)
+++ liboggplay/trunk/src/liboggplay/Makefile.am	2007-06-16 07:43:58 UTC (rev 2949)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CFLAGS = -Wall $(SSE2_CFLAGS) -Werror 
+AM_CFLAGS = -Wall $(SSE2_CFLAGS) -Werror -Wdeclaration-after-statement
 
 INCLUDES = $(INCLTDL) -I$(top_srcdir)/include