gst/typefind/gsttypefindfunctions.c: Terminate vararg functions with NULL instead...

Original commit message from CVS:
* gst/typefind/gsttypefindfunctions.c: (mp3_type_find),
(mpeg2_sys_type_find), (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find):
Terminate vararg functions with NULL instead of 0 to
make gcc4 happy.

diff --git a/ChangeLog b/ChangeLog
index f887369727e18805b63fddda131b7ff207f4e6a5..a11f2121da2712ed52c4561a06995d82534e5076 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-21  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/typefind/gsttypefindfunctions.c: (mp3_type_find),
+       (mpeg2_sys_type_find), (mpeg1_sys_type_find),
+       (mpeg_video_type_find), (mpeg_video_stream_type_find):
+         Terminate vararg functions with NULL instead of 0 to 
+         make gcc4 happy.
+
 2005-11-21  Andy Wingo  <wingo@pobox.com>
 
        patch from: Sebastien Cote <sebas642@yahoo.ca>

diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index a93abeca255fb48c1b9a2ffc1da584110a8ae34a..29576e892929e1c51acea57f7796c4687dbd4c09 100644 (file)
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -581,7 +581,7 @@ mp3_type_find (GstTypeFind * tf, gpointer unused)
             g_assert (layer > 0);
             caps = gst_caps_copy (MP3_CAPS);
             gst_structure_set (gst_caps_get_structure (caps, 0), "layer",
-                G_TYPE_INT, layer, 0);
+                G_TYPE_INT, layer, NULL);
             gst_type_find_suggest (tf, probability, caps);
             gst_caps_unref (caps);
           }
@@ -711,13 +711,13 @@ mpeg2_sys_type_find (GstTypeFind * tf, gpointer unused)
       GstCaps *caps = gst_caps_copy (MPEG_SYS_CAPS);
 
       gst_structure_set (gst_caps_get_structure (caps, 0), "mpegversion",
-          G_TYPE_INT, 2, 0);
+          G_TYPE_INT, 2, NULL);
       gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, caps);
     } else if ((data[4] & 0xF0) == 0x20) {
       GstCaps *caps = gst_caps_copy (MPEG_SYS_CAPS);
 
       gst_structure_set (gst_caps_get_structure (caps, 0), "mpegversion",
-          G_TYPE_INT, 1, 0);
+          G_TYPE_INT, 1, NULL);
       gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, caps);
       gst_caps_unref (caps);
     }
@@ -726,7 +726,7 @@ mpeg2_sys_type_find (GstTypeFind * tf, gpointer unused)
     GstCaps *caps = gst_caps_copy (MPEG_SYS_CAPS);
 
     gst_structure_set (gst_caps_get_structure (caps, 0), "mpegversion",
-        G_TYPE_INT, 2, 0);
+        G_TYPE_INT, 2, NULL);
     gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, caps);
   }
 
@@ -859,7 +859,7 @@ mpeg1_sys_type_find (GstTypeFind * tf, gpointer unused)
       if (found == GST_MPEG_TYPEFIND_TRY_HEADERS || packet_size == 1) {
         caps = gst_caps_copy (MPEG_SYS_CAPS);
         gst_structure_set (gst_caps_get_structure (caps, 0), "mpegversion",
-            G_TYPE_INT, 1, 0);
+            G_TYPE_INT, 1, NULL);
         gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM - 1, caps);
         gst_caps_unref (caps);
         return;
@@ -888,7 +888,7 @@ mpeg_video_type_find (GstTypeFind * tf, gpointer unused)
     GstCaps *caps = gst_caps_copy (MPEG_VIDEO_CAPS);
 
     gst_structure_set (gst_caps_get_structure (caps, 0), "mpegversion",
-        G_TYPE_INT, 1, 0);
+        G_TYPE_INT, 1, NULL);
     gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM - 1, caps);
     gst_caps_unref (caps);
   }
@@ -919,7 +919,7 @@ mpeg_video_stream_type_find (GstTypeFind * tf, gpointer unused)
       GstCaps *caps = gst_caps_copy (MPEG_VIDEO_CAPS);
 
       gst_structure_set (gst_caps_get_structure (caps, 0), "mpegversion",
-          G_TYPE_INT, 1, 0);
+          G_TYPE_INT, 1, NULL);
       gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM - 2, caps);
       gst_caps_unref (caps);
       return;