Browse Source

Fix int/long mismatch in gk_follow_frames()
Fix void return from non-void function add_video_stream()


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31325 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements 17 years ago
parent
commit
42a0a83c2e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      lib/ogsf/gk.c
  2. 1 1
      lib/ogsf/gsd_img_mpeg.c

+ 1 - 1
lib/ogsf/gk.c

@@ -174,7 +174,7 @@ void gk_follow_frames(Viewnode * view, int numsteps, Keylist * keys, int step,
 
 	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);

+ 1 - 1
lib/ogsf/gsd_img_mpeg.c

@@ -53,7 +53,7 @@ static AVStream *add_video_stream(AVFormatContext *oc, int codec_id, int w, int
     st = av_new_stream(oc, 0);
     if (!st) {
         fprintf(stderr, "Could not alloc stream\n");
-	return;
+	return NULL;
     }
 
     c = st->codec;