ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Apr 13 19:04:26 2017 -0300| [c5fd47fa8a300fc51489a47da94041609545803c] | committer: James Almer
Merge commit 'fc85646ad495f3418042468da415af73a7a07334' * commit 'fc85646ad495f3418042468da415af73a7a07334': libopusdec: fix out-of-bounds read libschroedingerdec: fix leaking of framewithpts libschroedingerdec: don't produce empty frames This commit is a noop, see a86ebbf7f641bc797002ddea7fb517759722cd1b 3c0328d58d98664b05efdd377d3fe66a569d385e 8c8f543b81aa2b50bb6a6cfd370a0061281492a3 Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5fd47fa8a300fc51489a47da94041609545803c --- libavcodec/libschroedingerdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 02cbe57c82..148a9b6098 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -309,9 +309,9 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx, framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue); if (framewithpts && framewithpts->frame && framewithpts->frame->components[0].stride) { - - if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0) + if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0) { goto end; + } memcpy(avframe->data[0], framewithpts->frame->components[0].data, ====================================================================== diff --cc libavcodec/libschroedingerdec.c index 02cbe57c82,69eed01ce0..148a9b6098 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@@ -309,9 -309,10 +309,9 @@@ static int libschroedinger_decode_frame framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue); if (framewithpts && framewithpts->frame && framewithpts->frame->components[0].stride) { - - if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0) + if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n"); goto end; + } memcpy(avframe->data[0], framewithpts->frame->components[0].data, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
