diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-12-12 20:05:33 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2018-12-12 20:05:33 +0000 |
| commit | 83db1efd42bd4d89a5a78bb3001481e009d99304 (patch) | |
| tree | ce4360d8149a130ff50fd637adeaf4a1e2552d34 /libavcodec | |
| parent | 0e833f615b59cd7611374d1d77257eaf00635ad7 (diff) | |
| download | ffmpeg-83db1efd42bd4d89a5a78bb3001481e009d99304.tar.gz | |
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: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/opusenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 578785f4b4..3c08ebcf69 100644 --- 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 */ } |