summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-04-28 03:13:48 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-04-28 03:13:48 +0000
commit9e67f51a373150a8e69a4ba4336ddc991c36e98d (patch)
treef1afa6cbed2da3cf9b574bf24796440798061e54
parente1ba883a54bf2ecda652cddf40ee60167cfd3e83 (diff)
ext/divx/gstdivxdec.c: Remove comment that makes no sense.
Original commit message from CVS: * ext/divx/gstdivxdec.c: (plugin_init): Remove comment that makes no sense. * ext/mad/gstid3tag.c: (gst_id3_tag_set_property): Fix for obvious typo that resulted in warnings during gst-register. * ext/xvid/gstxviddec.c: (gst_xviddec_src_link), (gst_xviddec_sink_link): Fix caps negotiation a bit better. * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): We call this 'codec_data', not 'esds'.
-rw-r--r--ChangeLog12
-rw-r--r--gst/qtdemux/qtdemux.c3
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f35ad31..d4b9a2b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-27 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/divx/gstdivxdec.c: (plugin_init):
+ Remove comment that makes no sense.
+ * ext/mad/gstid3tag.c: (gst_id3_tag_set_property):
+ Fix for obvious typo that resulted in warnings during gst-register.
+ * ext/xvid/gstxviddec.c: (gst_xviddec_src_link),
+ (gst_xviddec_sink_link):
+ Fix caps negotiation a bit better.
+ * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
+ We call this 'codec_data', not 'esds'.
+
2004-04-27 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/monoscope/gstmonoscope.c:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 3b32ef67..7f57e975 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -1739,7 +1739,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
buffer = gst_buffer_new_and_alloc (len - 8);
memcpy (GST_BUFFER_DATA (buffer), esds->data + 8, len - 8);
- gst_caps_set_simple (stream->caps, "esds", GST_TYPE_BUFFER, buffer, NULL);
+ gst_caps_set_simple (stream->caps, "codec_data",
+ GST_TYPE_BUFFER, buffer, NULL);
}
GST_INFO ("type " GST_FOURCC_FORMAT " caps %" GST_PTR_FORMAT,
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4)),