From 7f7c494a3340f71046dde62aa1939128600854a4 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 14 Oct 2016 00:33:50 -0700 Subject: [PATCH] ffmpeg_cleanup: fix crash with unrecognized codec since: 3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' Signed-off-by: James Zern Signed-off-by: Michael Niedermayer --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 693981f077..af8ed76a60 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -533,7 +533,7 @@ static void ffmpeg_cleanup(int ret) avcodec_free_context(&ost->enc_ctx); avcodec_parameters_free(&ost->ref_par); - while (av_fifo_size(ost->muxing_queue)) { + while (ost->muxing_queue && av_fifo_size(ost->muxing_queue)) { AVPacket pkt; av_fifo_generic_read(ost->muxing_queue, &pkt, sizeof(pkt), NULL); av_packet_unref(&pkt);