mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 01:32:42 +00:00
ffmpegdec: fix for query API change
This commit is contained in:
parent
8a3014f2fa
commit
afb69cf1d2
1 changed files with 1 additions and 2 deletions
|
@ -1922,7 +1922,6 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
|
||||||
/* out_offset already contains the offset from ts_info */
|
/* out_offset already contains the offset from ts_info */
|
||||||
GST_LOG_OBJECT (ffmpegdec, "Using offset returned by ffmpeg");
|
GST_LOG_OBJECT (ffmpegdec, "Using offset returned by ffmpeg");
|
||||||
} else if (out_timestamp != GST_CLOCK_TIME_NONE) {
|
} else if (out_timestamp != GST_CLOCK_TIME_NONE) {
|
||||||
GstFormat out_fmt = GST_FORMAT_DEFAULT;
|
|
||||||
GST_LOG_OBJECT (ffmpegdec, "Using offset converted from timestamp");
|
GST_LOG_OBJECT (ffmpegdec, "Using offset converted from timestamp");
|
||||||
/* FIXME, we should really remove this as it's not nice at all to do
|
/* 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
|
* 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
|
* on outgoing buffers. We should have metadata so that the upstream peer
|
||||||
* can set a frame number on the encoded data. */
|
* can set a frame number on the encoded data. */
|
||||||
gst_pad_query_peer_convert (ffmpegdec->sinkpad,
|
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) {
|
} else if (dec_info->offset != GST_BUFFER_OFFSET_NONE) {
|
||||||
/* FIXME, the input offset is input media specific and might not
|
/* FIXME, the input offset is input media specific and might not
|
||||||
* be the same for the output media. (byte offset as input, frame number
|
* be the same for the output media. (byte offset as input, frame number
|
||||||
|
|
Loading…
Reference in a new issue