mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpegdec: fix for query API change

Browse source
This commit is contained in:
Wim Taymans 2011-07-29 12:34:04 +02:00
parent 8a3014f2fa
commit afb69cf1d2
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/ffmpeg/gstffmpegdec.c
View file

@ -1922,7 +1922,6 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* out_offset already contains the offset from ts_info */
GST_LOG_OBJECT (ffmpegdec, "Using offset returned by ffmpeg");
} else if (out_timestamp != GST_CLOCK_TIME_NONE) {
GstFormat out_fmt = GST_FORMAT_DEFAULT;
GST_LOG_OBJECT (ffmpegdec, "Using offset converted from timestamp");
/* FIXME, we should really remove this as it's not nice at all to do
* upstream queries for each frame to get the frame offset. We also can't
@ -1930,7 +1929,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
* on outgoing buffers. We should have metadata so that the upstream peer
* can set a frame number on the encoded data. */
gst_pad_query_peer_convert (ffmpegdec->sinkpad,
GST_FORMAT_TIME, out_timestamp, &out_fmt, &out_offset);
GST_FORMAT_TIME, out_timestamp, GST_FORMAT_DEFAULT, &out_offset);
} else if (dec_info->offset != GST_BUFFER_OFFSET_NONE) {
/* FIXME, the input offset is input media specific and might not
* be the same for the output media. (byte offset as input, frame number