From ce589940c2cac936891e8bba275580d6efc41e8b Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 14 Apr 2016 12:21:22 +0200 Subject: mmaldec: send only a single EOS packet on flushing Fixes apparent mmal_port_disable() freezes in ffmmal_stop_decoder() when calling ffmmal_decode() with flush semantics a large number of times in a row. Signed-off-by: Anton Khirnov --- libavcodec/mmaldec.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec') diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 77838dc509..3cc96912b0 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -477,6 +477,8 @@ static int ffmmal_add_packet(AVCodecContext *avctx, AVPacket *avpkt, if (!is_extradata) ctx->packets_sent++; } else { + if (ctx->eos_sent) + goto done; if (!ctx->packets_sent) { // Short-cut the flush logic to avoid upsetting MMAL. ctx->eos_sent = 1; -- cgit v1.2.3