summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-08-10 09:33:58 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-08-10 09:33:58 +0000
commit1d185d4127c0b46c05ed8707413215569e60a602 (patch)
tree45c254e1ea7add98881a7e1878a80b8e93f1d322
parentee6172a676aa135b52ea48795a0ee8d820efe9e4 (diff)
ext/faad/gstfaad.c: Add debug category, remove Close() call that made it crash whenever reusing, renegotiating or any...
Original commit message from CVS: * ext/faad/gstfaad.c: (gst_faad_class_init), (gst_faad_setcaps): Add debug category, remove Close() call that made it crash whenever reusing, renegotiating or anything; Close() actually free()s the handle and should only be called on READY->NULL. * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header): Actually set caps on buffer (in addition to pad), also.
-rw-r--r--ChangeLog9
-rw-r--r--gst/qtdemux/qtdemux.c3
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 73765bf6..e16ac963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/faad/gstfaad.c: (gst_faad_class_init), (gst_faad_setcaps):
+ Add debug category, remove Close() call that made it crash
+ whenever reusing, renegotiating or anything; Close() actually
+ free()s the handle and should only be called on READY->NULL.
+ * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header):
+ Actually set caps on buffer (in addition to pad), also.
+
2005-08-10 Owen Fraser-Green <owen@discobabe.net>
* gst/realmedia/rmdemux.c (gst_rmdemux_sink_activate)
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 32d31ddc..7a31f89e 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -678,8 +678,9 @@ gst_qtdemux_loop_header (GstPad * pad)
/* ? */
qtdemux->need_flush = FALSE;
}
- GST_DEBUG ("Pushing buf with time=%" GST_TIME_FORMAT "\n",
+ GST_DEBUG ("Pushing buf with time=%" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
+ gst_buffer_set_caps (buf, stream->caps);
gst_pad_push (stream->pad, buf);
GST_INFO ("pushing buffer on %" GST_PTR_FORMAT, stream->pad);