mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

avdemux: update for task api change

Browse source
This commit is contained in:
Wim Taymans 2012-06-20 10:36:25 +02:00
parent 17ee8113d7
commit eb52e46b07
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/ffmpeg/gstffmpegdemux.c
View file

@ -267,7 +267,8 @@ gst_ffmpegdemux_init (GstFFMpegDemux * demux)
gst_pad_set_chain_function (demux->sinkpad, gst_pad_set_chain_function (demux->sinkpad,
GST_DEBUG_FUNCPTR (gst_ffmpegdemux_chain)); GST_DEBUG_FUNCPTR (gst_ffmpegdemux_chain));
/* task for driving ffmpeg in loop function */ /* task for driving ffmpeg in loop function */
demux->task = gst_task_new ((GstTaskFunction) gst_ffmpegdemux_loop, demux); demux->task =
gst_task_new ((GstTaskFunction) gst_ffmpegdemux_loop, demux, NULL);
g_rec_mutex_init (&demux->task_lock); g_rec_mutex_init (&demux->task_lock);
gst_task_set_lock (demux->task, &demux->task_lock); gst_task_set_lock (demux->task, &demux->task_lock);
@ -630,7 +631,7 @@ gst_ffmpegdemux_perform_seek (GstFFMpegDemux * demux, GstEvent * event)
/* and restart the task in case it got paused explicitely or by /* and restart the task in case it got paused explicitely or by
* the FLUSH_START event we pushed out. */ * the FLUSH_START event we pushed out. */
gst_pad_start_task (demux->sinkpad, (GstTaskFunction) gst_ffmpegdemux_loop, gst_pad_start_task (demux->sinkpad, (GstTaskFunction) gst_ffmpegdemux_loop,
demux->sinkpad); demux->sinkpad, NULL);
/* and release the lock again so we can continue streaming */ /* and release the lock again so we can continue streaming */
GST_PAD_STREAM_UNLOCK (demux->sinkpad); GST_PAD_STREAM_UNLOCK (demux->sinkpad);
@ -1778,7 +1779,7 @@ gst_ffmpegdemux_sink_activate_pull (GstPad * sinkpad, GstObject * parent,
if (active) { if (active) {
demux->seekable = TRUE; demux->seekable = TRUE;
res = gst_pad_start_task (sinkpad, (GstTaskFunction) gst_ffmpegdemux_loop, res = gst_pad_start_task (sinkpad, (GstTaskFunction) gst_ffmpegdemux_loop,
demux); demux, NULL);
} else { } else {
res = gst_pad_stop_task (sinkpad); res = gst_pad_stop_task (sinkpad);
demux->seekable = FALSE; demux->seekable = FALSE;