ffmpeg_cleanup: fix crash with unrecognized codec
authorJames Zern <jzern-at-google.com@ffmpeg.org>
Fri, 14 Oct 2016 07:33:50 +0000 (00:33 -0700)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 14 Oct 2016 15:02:33 +0000 (17:02 +0200)
since:
3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'

Signed-off-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
ffmpeg.c

index 693981f..af8ed76 100644 (file)
--- 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);