diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-27 12:44:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-19 03:51:37 +0100 |
| commit | c3ee01b9da8357839e797240c47b8356fb8a71ad (patch) | |
| tree | 557609e28be249ed4536b1304a93b74f27edb9b5 | |
| parent | 10870af7e46baae72bf2f62e10b3929f9e51f78f (diff) | |
| download | ffmpeg-c3ee01b9da8357839e797240c47b8356fb8a71ad.tar.gz | |
avcodec/libopusenc: Fix infinite loop on flushing after 0 input
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6701c92fa4269872856c70c3170a9b3291b46247)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/libopusenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 785460972d..edb0b38bc4 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -326,7 +326,7 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, } else audio = frame->data[0]; } else { - if (!opus->afq.remaining_samples) + if (!opus->afq.remaining_samples || (!opus->afq.frame_alloc && !opus->afq.frame_count)) return 0; audio = opus->samples; memset(audio, 0, opus->opts.packet_size * sample_size); |