[GRASS-SVN] r31325 - grass/trunk/lib/ogsf

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-05-12 18:11:03 -0400 (Mon, 12 May 2008)
New Revision: 31325

Modified:
   grass/trunk/lib/ogsf/gk.c
   grass/trunk/lib/ogsf/gsd_img_mpeg.c
Log:
Fix int/long mismatch in gk_follow_frames()
Fix void return from non-void function add_video_stream()


Modified: grass/trunk/lib/ogsf/gk.c
===================================================================
--- grass/trunk/lib/ogsf/gk.c	2008-05-12 22:08:19 UTC (rev 31324)
+++ grass/trunk/lib/ogsf/gk.c	2008-05-12 22:11:03 UTC (rev 31325)
@@ -174,7 +174,7 @@
 
 	GS_get_from(tmp);
 	G_debug(3, "gk_follow_frames():");
-	G_debug(3, "  MASK: %x", mask);
+	G_debug(3, "  MASK: %lx", mask);
 	G_debug(3, "  FROM: %f %f %f", tmp[X], tmp[Y], tmp[Z]);
 
 	/* ACS 1 line: was 	GS_get_focus(tmp);

Modified: grass/trunk/lib/ogsf/gsd_img_mpeg.c
===================================================================
--- grass/trunk/lib/ogsf/gsd_img_mpeg.c	2008-05-12 22:08:19 UTC (rev 31324)
+++ grass/trunk/lib/ogsf/gsd_img_mpeg.c	2008-05-12 22:11:03 UTC (rev 31325)
@@ -53,7 +53,7 @@
     st = av_new_stream(oc, 0);
     if (!st) {
         fprintf(stderr, "Could not alloc stream\n");
-	return;
+	return NULL;
     }
 
     c = st->codec;