generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/libopusenc: Fix infinite loop on flushing after 0 input

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6701c92fa4269872856c70c3170a9b3291b46247)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-08-27 12:44:31 +02:00
parent 679df05683
commit 42fd94b514
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libopusenc.c
View File

@ -326,7 +326,7 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt,
} else } else
audio = frame->data[0]; audio = frame->data[0];
} else { } else {
if (!opus->afq.remaining_samples) if (!opus->afq.remaining_samples || (!opus->afq.frame_alloc && !opus->afq.frame_count))
return 0; return 0;
audio = opus->samples; audio = opus->samples;
memset(audio, 0, opus->opts.packet_size * sample_size); memset(audio, 0, opus->opts.packet_size * sample_size);