From: <tp...@fr...> - 2005-12-21 10:26:32
|
CVS Root: /cvs/gstreamer Module: gst-plugins-ugly Changes by: tpm Date: Wed Dec 21 2005 02:25:46 PST Log message: * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_src_event): When getting a seek event, first check if the upstream element can handle it and only do our own seek stuff when it can't (should fix #322856). Modified files: . : ChangeLog ext/mpeg2dec : gstmpeg2dec.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ChangeLog.diff?r1=1.1923&r2=1.1924 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ext/mpeg2dec/gstmpeg2dec.c.diff?r1=1.100&r2=1.101 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-ugly/ChangeLog,v retrieving revision 1.1923 retrieving revision 1.1924 diff -u -d -r1.1923 -r1.1924 --- ChangeLog 21 Dec 2005 09:58:43 -0000 1.1923 +++ ChangeLog 21 Dec 2005 10:25:34 -0000 1.1924 @@ -1,3 +1,10 @@ +2005-12-21 Tim-Philipp Müller <tim at centricular dot net> + + * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_src_event): + When getting a seek event, first check if the upstream element + can handle it and only do our own seek stuff when it can't + (should fix #322856). 2005-12-21 Josef Zlomek <josef dot zlomek at xeris dot cz> Reviewed by: Tim-Philipp Müller <tim at centricular dot net> Index: gstmpeg2dec.c RCS file: /cvs/gstreamer/gst-plugins-ugly/ext/mpeg2dec/gstmpeg2dec.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- gstmpeg2dec.c 21 Dec 2005 09:58:43 -0000 1.100 +++ gstmpeg2dec.c 21 Dec 2005 10:25:34 -0000 1.101 @@ -1325,14 +1325,17 @@ switch (GST_EVENT_TYPE (event)) { /* the all-formats seek logic */ - case GST_EVENT_SEEK: - if (mpeg2dec->index) - res = index_seek (pad, event); - else - res = normal_seek (pad, event); - + case GST_EVENT_SEEK:{ + gst_event_ref (event); + if (!(res = gst_pad_event_default (pad, event))) { + if (mpeg2dec->index) + res = index_seek (pad, event); + else + res = normal_seek (pad, event); + } gst_event_unref (event); break; + } case GST_EVENT_NAVIGATION: /* Forward a navigation event unchanged */ default: |