virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'fc85646ad495f3418042468da415af73a7a07334'

Browse Source 
* 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

a86ebbf7f6
3c0328d58d
8c8f543b81

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-13 19:04:26 -03:00
commit c5fd47fa8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libschroedingerdec.c
View File

@ -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,