Commit 83db1efd authored by Rostislav Pehlivanov's avatar Rostislav Pehlivanov

opusenc: fix infinite loop if flushing encoder upon init

The issue is that the afq still has samples as on init it counts
the overlap used as a delay to adjust the PTS it generates, hence
we can't rely on it right after init.
So just check to see if any frames have been encoded. frame_number
can't be anything but 0 right after init and can only be set by lavc.
Signed-off-by: 's avatarRostislav Pehlivanov <atomnuker@gmail.com>
parent 0e833f61
......@@ -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 */
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment