Merge remote-tracking branch 'keema/master'

This commit is contained in:
Sebastian Dröge 2012-07-05 17:11:52 +02:00
commit 72d4a3abfc
2 changed files with 3 additions and 3 deletions

View file

@ -28,12 +28,12 @@ static void send_seek_event (CustomData *data) {
GST_SEEK_TYPE_SET, position, GST_SEEK_TYPE_NONE, 0); GST_SEEK_TYPE_SET, position, GST_SEEK_TYPE_NONE, 0);
} else { } else {
seek_event = gst_event_new_seek (data->rate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, seek_event = gst_event_new_seek (data->rate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
GST_SEEK_TYPE_NONE, 0, GST_SEEK_TYPE_SET, position); GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_SET, position);
} }
if (data->video_sink == NULL) { if (data->video_sink == NULL) {
/* If we have not done so, obtain the sink through which we will send the seek events */ /* If we have not done so, obtain the sink through which we will send the seek events */
g_object_get (data->pipeline, "video_sink", &data->video_sink, NULL); g_object_get (data->pipeline, "video-sink", &data->video_sink, NULL);
} }
/* Send the event */ /* Send the event */

View file

@ -20,7 +20,7 @@ typedef struct _CustomData {
} CustomData; } CustomData;
/* This method is called by the idle GSource in the mainloop, to feed CHUNK_SIZE bytes into appsrc. /* This method is called by the idle GSource in the mainloop, to feed CHUNK_SIZE bytes into appsrc.
* The ide handler is added to the mainloop when appsrc requests us to start sending data (need-data signal) * The idle handler is added to the mainloop when appsrc requests us to start sending data (need-data signal)
* and is removed when appsrc has enough data (enough-data signal). * and is removed when appsrc has enough data (enough-data signal).
*/ */
static gboolean push_data (CustomData *data) { static gboolean push_data (CustomData *data) {