virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'

Browse Source 
* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
	libavcodec/libschroedinger.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-23 11:42:16 +01:00
commit 96b495f443
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libschroedingerdec.c
View File

@ -267,6 +267,8 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
/* Decoder needs a frame - create one and push it in. */ /* Decoder needs a frame - create one and push it in. */
frame = ff_create_schro_frame(avctx, frame = ff_create_schro_frame(avctx,
p_schro_params->frame_format); p_schro_params->frame_format);
if (!frame)
return AVERROR(ENOMEM);
schro_decoder_add_output_picture(decoder, frame); schro_decoder_add_output_picture(decoder, frame);
break; break;

4
libavcodec/libschroedingerenc.c
View File

@ -284,6 +284,8 @@ static int libschroedinger_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
} else { } else {
/* Allocate frame data to schro input buffer. */ /* Allocate frame data to schro input buffer. */
SchroFrame *in_frame = libschroedinger_frame_from_data(avctx, frame); SchroFrame *in_frame = libschroedinger_frame_from_data(avctx, frame);
if (!in_frame)
return AVERROR(ENOMEM);
/* Load next frame. */ /* Load next frame. */
schro_encoder_push_frame(encoder, in_frame); schro_encoder_push_frame(encoder, in_frame);
} }
@ -332,6 +334,8 @@ static int libschroedinger_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
/* Create output frame. */ /* Create output frame. */
p_frame_output = av_mallocz(sizeof(FFSchroEncodedFrame)); p_frame_output = av_mallocz(sizeof(FFSchroEncodedFrame));
if (!p_frame_output)
return AVERROR(ENOMEM);
/* Set output data. */ /* Set output data. */
p_frame_output->size = p_schro_params->enc_buf_size; p_frame_output->size = p_schro_params->enc_buf_size;
p_frame_output->p_encbuf = p_schro_params->enc_buf; p_frame_output->p_encbuf = p_schro_params->enc_buf;