summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2004-01-28 22:14:12 +0000
committerJulien Moutte <julien@moutte.net>2004-01-28 22:14:12 +0000
commit1b5d548d52ea8bbc94d1e017c58bfd3777ad905b (patch)
treeb7fb36a8857cd7fb30dbce3e4a8e1ff1f05fa734
parent8519d74beb386dd79f1228ba134f698678c837f4 (diff)
downloadgst-plugins-bad-1b5d548d52ea8bbc94d1e017c58bfd3777ad905b.tar.gz
gst-plugins-bad-1b5d548d52ea8bbc94d1e017c58bfd3777ad905b.tar.bz2
gst-plugins-bad-1b5d548d52ea8bbc94d1e017c58bfd3777ad905b.zip
gst-libs/gst/play/gstplay.c: seek on video sink element first.
Original commit message from CVS: 2004-01-28 Julien MOUTTE <julien@moutte.net> * gst-libs/gst/play/gstplay.c: (gst_play_seek_to_time): seek on video sink element first. * gst/videoscale/gstvideoscale.c: (gst_videoscale_handle_src_event): Fixing src event handler.
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--gst-libs/gst/play/gstplay.c4
-rw-r--r--gst-libs/gst/play/play.c4
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fbb86c6b..2e6ca9e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-28 Julien MOUTTE <julien@moutte.net>
+
+ * gst-libs/gst/play/gstplay.c: (gst_play_seek_to_time): seek on video
+ sink element first.
+ * gst/videoscale/gstvideoscale.c:
+ (gst_videoscale_handle_src_event): Fixing src event handler.
+
2004-01-28 Ronald Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_class_init), (gst_v4lsrc_init),
diff --git a/common b/common
-Subproject 0bcde342015b96d9a6ba3b9d9102e2a543399d9
+Subproject 5da247bb6f217c5c32e5ebab0d3a2014dfa452c
diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c
index d8658e49..f9389ea1 100644
--- a/gst-libs/gst/play/gstplay.c
+++ b/gst-libs/gst/play/gstplay.c
@@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
GST_IS_ELEMENT (video_sink_element)) {
gboolean s = FALSE;
- s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
+ s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
time_nanos);
if (!s) {
- s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
+ s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
time_nanos);
}
diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index d8658e49..f9389ea1 100644
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -641,11 +641,11 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
GST_IS_ELEMENT (video_sink_element)) {
gboolean s = FALSE;
- s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
+ s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
time_nanos);
if (!s) {
- s = gst_element_seek (video_sink_element, GST_FORMAT_TIME |
+ s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
time_nanos);
}