From 8deb4fbd925656c38ad5b6553769e524e707dba9 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 12 Nov 2007 17:21:59 +0000 Subject: [PATCH] gst/: Drop EOS in _handle_src_event(). Fix the refcount in qtdemux that previous commit messed up. Original commit message from CVS: * gst/avi/gstavidemux.c: * gst/qtdemux/qtdemux.c: Drop EOS in _handle_src_event(). Fix the refcount in qtdemux that previous commit messed up. --- ChangeLog | 7 +++++++ gst/avi/gstavidemux.c | 5 +++++ gst/qtdemux/qtdemux.c | 9 +++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d5bd5602a..5aaf4c3197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-12 Stefan Kost + + * gst/avi/gstavidemux.c: + * gst/qtdemux/qtdemux.c: + Drop EOS in _handle_src_event(). Fix the refcount in qtdemux that + previous commit messed up. + 2007-11-12 Stefan Kost * gst/avi/gstavidemux.c: diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index d37db1b549..06cf2140c3 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -602,6 +602,11 @@ gst_avi_demux_handle_src_event (GstPad * pad, GstEvent * event) res = gst_avi_demux_handle_seek (avi, pad, event); gst_event_unref (event); break; + case GST_EVENT_QOS: + case GST_EVENT_NAVIGATION: + res = FALSE; + gst_event_unref (event); + break; default: res = gst_pad_event_default (pad, event); break; diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 169862f65b..63dc97ecd8 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -842,14 +842,19 @@ gst_qtdemux_handle_src_event (GstPad * pad, GstEvent * event) GST_DEBUG_OBJECT (qtdemux, "cannot seek in streaming mode"); res = FALSE; } - gst_object_unref (qtdemux); + gst_event_unref (event); + break; + case GST_EVENT_QOS: + case GST_EVENT_NAVIGATION: + res = FALSE; + gst_event_unref (event); break; default: res = gst_pad_event_default (pad, event); break; } - gst_event_unref (event); + gst_object_unref (qtdemux); return res; }