highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e'

Browse Source 
* commit 'b09cf8afc5199d359ac985ad7cea72a6a9f20e4e':
  libopusenc: check return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-13 12:01:37 +01:00
parent 8e6084eebe b09cf8afc5
commit 3c6e148e84
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libopusenc.c
View File

@ -316,7 +316,9 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt,
int discard_padding; int discard_padding;
if (frame) { if (frame) {
ff_af_queue_add(&opus->afq, frame); ret = ff_af_queue_add(&opus->afq, frame);
if (ret < 0)
return ret;
if (frame->nb_samples < opus->opts.packet_size) { if (frame->nb_samples < opus->opts.packet_size) {
audio = opus->samples; audio = opus->samples;
memcpy(audio, frame->data[0], frame->nb_samples * sample_size); memcpy(audio, frame->data[0], frame->nb_samples * sample_size);