diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-27 12:44:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:48 +0100 |
| commit | ab79e3d1a5f9b2d677273d15970a719b8be039bf (patch) | |
| tree | dbb0df530cf55e81bf6c1d0b800e933ac166b896 | |
| parent | a38a41df39896fb48393f7a51df90c7bcdd785e3 (diff) | |
| download | ffmpeg-ab79e3d1a5f9b2d677273d15970a719b8be039bf.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 9a1952a625..dadd7f01e8 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -324,7 +324,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); |