vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Thu Apr 20 13:46:13 2017 +0200| [c114f4211f03a2899827b6598738200f91a75a29] | committer: Thomas Guillem
mediacodec: fix deadlock when drain times out > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c114f4211f03a2899827b6598738200f91a75a29 --- modules/codec/omxil/mediacodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c index fde5cea190..922719c538 100644 --- a/modules/codec/omxil/mediacodec.c +++ b/modules/codec/omxil/mediacodec.c @@ -1351,7 +1351,7 @@ static int QueueBlockLocked(decoder_t *p_dec, block_t *p_in_block, if (!p_sys->b_drained) { msg_Err(p_dec, "OutThread timed out"); - p_sys->b_aborted = true; + AbortDecoderLocked(p_dec); } p_sys->b_drained = false; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits