From 478417da1af5b168594167bc2ab4ab71b60085e9 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Mon, 6 Oct 2008 08:32:41 +0000 Subject: [PATCH] gst/mpegdemux/gstmpegtsdemux.c: Fix wrong firing of critical introduced by previous optimisation. Original commit message from CVS: Patch by: Josep Torra * gst/mpegdemux/gstmpegtsdemux.c: Fix wrong firing of critical introduced by previous optimisation. --- ChangeLog | 7 +++++++ gst/mpegdemux/gstmpegtsdemux.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73f046cf46..149683398d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-06 Zaheer Abbas Merali + + Patch by: Josep Torra + + * gst/mpegdemux/gstmpegtsdemux.c: + Fix wrong firing of critical introduced by previous optimisation. + 2008-10-03 Wim Taymans * ext/faac/gstfaac.c: (gst_faac_configure_source_pad): diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c index a420d6461c..c0fabd3165 100644 --- a/gst/mpegdemux/gstmpegtsdemux.c +++ b/gst/mpegdemux/gstmpegtsdemux.c @@ -1954,13 +1954,13 @@ gst_fluts_demux_is_PMT (GstFluTSDemux * demux, guint16 PID) static FORCE_INLINE GstFlowReturn gst_fluts_stream_pes_buffer_flush (GstFluTSStream * stream) { - GstFlowReturn ret; + GstFlowReturn ret = GST_FLOW_OK; - g_return_val_if_fail (stream->pes_buffer, GST_FLOW_OK); - - GST_BUFFER_SIZE (stream->pes_buffer) = stream->pes_buffer_used; - ret = gst_pes_filter_push (&stream->filter, stream->pes_buffer); - stream->pes_buffer = NULL; + if (stream->pes_buffer) { + GST_BUFFER_SIZE (stream->pes_buffer) = stream->pes_buffer_used; + ret = gst_pes_filter_push (&stream->filter, stream->pes_buffer); + stream->pes_buffer = NULL; + } return ret; }