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 <[email protected]>
lmy8848 · Apr 30, 2016 · ce58994 · ce58994
1 parent 46aaad7
commit ce58994
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;