| Message ID | 1476430430-96490-1-git-send-email-jzern@google.com |
|---|---|
| State | Accepted |
| Commit | 7f7c494a3340f71046dde62aa1939128600854a4 |
| Headers | show |
On Fri, Oct 14, 2016 at 12:33:50AM -0700, James Zern wrote: > since: > 3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' > > Signed-off-by: James Zern <jzern@google.com> > --- > ffmpeg.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) applied thx [...]
diff --git a/ffmpeg.c b/ffmpeg.c index 693981f..af8ed76 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);
since: 3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' Signed-off-by: James Zern <jzern@google.com> --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)