From 2a9a1bcfdc4185ede1d8508d2deb6a3df00177e2 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 6 Apr 2006 10:50:14 +0000 Subject: [PATCH] ext/ogg/gstoggmux.c (gst_ogg_mux_push_buffer): Set caps on buffers being pushed out. Fixes oggmux ! multifdsink. Original commit message from CVS: 2006-04-06 Andy Wingo * ext/ogg/gstoggmux.c (gst_ogg_mux_push_buffer): Set caps on buffers being pushed out. Fixes oggmux ! multifdsink. --- ChangeLog | 5 +++++ common | 2 +- ext/ogg/gstoggmux.c | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 16062e4bd2..152ae12b7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-06 Andy Wingo + + * ext/ogg/gstoggmux.c (gst_ogg_mux_push_buffer): Set caps on + buffers being pushed out. Fixes oggmux ! multifdsink. + 2006-04-05 Tim-Philipp Müller * ext/vorbis/vorbisdec.c: (gst_vorbis_dec_class_init), diff --git a/common b/common index cbedff4d5f..623fe1c2cc 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit cbedff4d5f090d43fdeaa189748a6651f2c6a07f +Subproject commit 623fe1c2cce45bc30d5823c05716349874ae994e diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index b68d59742f..8268e6188b 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -507,11 +507,17 @@ gst_ogg_mux_buffer_from_page (GstOggMux * mux, ogg_page * page, gboolean delta) static GstFlowReturn gst_ogg_mux_push_buffer (GstOggMux * mux, GstBuffer * buffer) { + GstCaps *caps; + /* fix up OFFSET and OFFSET_END again */ GST_BUFFER_OFFSET (buffer) = mux->offset; mux->offset += GST_BUFFER_SIZE (buffer); GST_BUFFER_OFFSET_END (buffer) = mux->offset; + caps = gst_pad_get_negotiated_caps (mux->srcpad); + gst_buffer_set_caps (buffer, caps); + gst_caps_unref (caps); + return gst_pad_push (mux->srcpad, buffer); }