summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-04-09 08:01:39 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-04-09 08:01:39 +0000
commitba521058368773a88e5ca2a9a3d7c0e5a0672f98 (patch)
tree49d853626e76c22e8f39fd82f308f7ae5a1b09ed
parentb541b7ee71d7656d897091dd06a3e17b372b461d (diff)
downloadgst-plugins-bad-ba521058368773a88e5ca2a9a3d7c0e5a0672f98.tar.gz
gst-plugins-bad-ba521058368773a88e5ca2a9a3d7c0e5a0672f98.tar.bz2
gst-plugins-bad-ba521058368773a88e5ca2a9a3d7c0e5a0672f98.zip
gst/qtdemux/qtdemux.c: NULL-terminate vararg functions properly (#172946).
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): NULL-terminate vararg functions properly (#172946).
-rw-r--r--ChangeLog5
-rw-r--r--gst/qtdemux/qtdemux.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b1ede12..562307a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
+ NULL-terminate vararg functions properly (#172946).
+
2005-04-08 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume):
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index b8d01fdb..0faf4ee2 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2097,7 +2097,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
if (codec) {
list = gst_tag_list_new ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
- GST_TAG_VIDEO_CODEC, codec);
+ GST_TAG_VIDEO_CODEC, codec, NULL);
}
esds = NULL;
@@ -2192,7 +2192,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
if (codec) {
list = gst_tag_list_new ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
- GST_TAG_AUDIO_CODEC, codec);
+ GST_TAG_AUDIO_CODEC, codec, NULL);
}
mp4a = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4a);