mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 08:11:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source
This commit is contained in:
Wim Taymans 2012-04-20 16:23:41 +02:00
commit cd2e53aa9f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/ffmpeg/gstffmpegdec.c
View file

@ -2757,15 +2757,15 @@ gst_ffmpegdec_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
discont = GST_BUFFER_IS_DISCONT (inbuf); discont = GST_BUFFER_IS_DISCONT (inbuf);
/* The discont flags marks a buffer that is not continuous with the previous /* The discont flags marks a buffer that is not continuous with the previous
* buffer. This means we need to clear whatever data we currently have. We * buffer. This means we need to clear whatever data we currently have. We let
* currently also wait for a new keyframe, which might be suboptimal in the * ffmpeg continue with the data that it has. We currently drain the old
* case of a network error, better show the errors than to drop all data.. */ * frames that might be inside the decoder and we clear any partial data in
* the pcache, we might be able to remove the drain and flush too. */
if (G_UNLIKELY (discont)) { if (G_UNLIKELY (discont)) {
GST_DEBUG_OBJECT (ffmpegdec, "received DISCONT"); GST_DEBUG_OBJECT (ffmpegdec, "received DISCONT");
/* drain what we have queued */ /* drain what we have queued */
gst_ffmpegdec_drain (ffmpegdec); gst_ffmpegdec_drain (ffmpegdec);
gst_ffmpegdec_flush_pcache (ffmpegdec); gst_ffmpegdec_flush_pcache (ffmpegdec);
avcodec_flush_buffers (ffmpegdec->context);
ffmpegdec->discont = TRUE; ffmpegdec->discont = TRUE;
gst_ffmpegdec_reset_ts (ffmpegdec); gst_ffmpegdec_reset_ts (ffmpegdec);
} }