Merge commit 'ca44fa5d7fda7e954f3ebfeb5b0d6d1be55fcaa3'

[ffmpeg] / libavcodec / opusenc.c

diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c
index 578785f4b417b563ced9b9522abcea4fefaa3afb..3c08ebcf69584c68873d08181d1839f00b5a1f92 100644 (file)
--- a/libavcodec/opusenc.c
+++ b/libavcodec/opusenc.c
@@ -543,7 +543,7 @@ static int opus_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
         ff_bufqueue_add(avctx, &s->bufqueue, av_frame_clone(frame));
     } else {
         ff_opus_psy_signal_eof(&s->psyctx);
-        if (!s->afq.remaining_samples)
+        if (!s->afq.remaining_samples || !avctx->frame_number)
             return 0; /* We've been flushed and there's nothing left to encode */
     }