From dafe4cd29cada351a2785433b24401fc602911c4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 10 Nov 2015 13:47:01 +0100 Subject: [PATCH] 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. --- libavcodec/mmaldec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index d419096c9a..281071cc80 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -476,6 +476,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;