projects
/
platform
/
upstream
/
gst-libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af91ba1
)
avviddec: If a flow return during draining is not OK, don't drain any further
author
Sebastian Dröge
<sebastian@centricular.com>
Mon, 9 Mar 2015 21:02:19 +0000
(22:02 +0100)
committer
Sebastian Dröge
<sebastian@centricular.com>
Mon, 9 Mar 2015 21:02:19 +0000
(22:02 +0100)
ext/libav/gstavviddec.c
patch
|
blob
|
history
diff --git
a/ext/libav/gstavviddec.c
b/ext/libav/gstavviddec.c
index
e301905
..
4689d57
100644
(file)
--- a/
ext/libav/gstavviddec.c
+++ b/
ext/libav/gstavviddec.c
@@
-1460,16
+1460,14
@@
gst_ffmpegviddec_drain (GstFFMpegVidDec * ffmpegdec)
if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) {
gint have_data, len;
+ GstFlowReturn ret;
GST_LOG_OBJECT (ffmpegdec,
"codec has delay capabilities, calling until ffmpeg has drained everything");
do {
- GstFlowReturn ret;
-
len = gst_ffmpegviddec_frame (ffmpegdec, NULL, 0, &have_data, NULL, &ret);
-
- } while (len >= 0 && have_data == 1);
+ } while (len >= 0 && have_data == 1 && ret == GST_FLOW_OK);
avcodec_flush_buffers (ffmpegdec->context);
}
}