summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Gilquin <yann.gilquin@purplelabs.com>2007-10-05 15:03:21 +0000
committerWim Taymans <wim.taymans@gmail.com>2007-10-05 15:03:21 +0000
commit808f08027930fd50c2a475490f22cb84ab07adaa (patch)
tree5d63bfe4b6297a8d4f6496bccaf85260015d2f28
parent033751e57e46fb03beecba793f5bd3694749335e (diff)
ext/ffmpeg/gstffmpegdemux.c: Don't return FALSE for the LATENCY event but instead forward it upstream. Fixes #482946.
Original commit message from CVS: Patch by: Yann Gilquin <yann dot gilquin at purplelabs dot com> * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_event): Don't return FALSE for the LATENCY event but instead forward it upstream. Fixes #482946.
-rw-r--r--ChangeLog8
-rw-r--r--ext/ffmpeg/gstffmpegdemux.c8
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d8ac06d..99a9e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-05 Wim Taymans <wim.taymans@gmail.com>
+
+ Patch by: Yann Gilquin <yann dot gilquin at purplelabs dot com>
+
+ * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_event):
+ Don't return FALSE for the LATENCY event but instead forward it
+ upstream. Fixes #482946.
+
2007-10-03 Stefan Kost <ensonic@users.sf.net>
* tests/check/generic/libavcodec-locking.c:
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 0003a5e..b0a5322 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -591,14 +591,20 @@ gst_ffmpegdemux_src_event (GstPad * pad, GstEvent * event)
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEEK:
res = gst_ffmpegdemux_perform_seek (demux, event);
+ gst_event_unref (event);
break;
+ case GST_EVENT_LATENCY:
+ res = gst_pad_push_event (demux->sinkpad, event);
+ break;
+ case GST_EVENT_NAVIGATION:
+ case GST_EVENT_QOS:
default:
res = FALSE;
+ gst_event_unref (event);
break;
}
gst_object_unref (demux);
- gst_event_unref (event);
return res;
}