[FFmpeg-cvslog] r22648 - trunk/libavcodec/mpegvideo_enc.c
cehoyos
subversion
Tue Mar 23 18:58:40 CET 2010
Author: cehoyos
Date: Tue Mar 23 18:58:39 2010
New Revision: 22648
Log:
Always check if ff_alloc_picture() succeeds.
Patch by Pavel Pavlov, pavel summit-tech ca
Modified:
trunk/libavcodec/mpegvideo_enc.c
Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c Tue Mar 23 18:55:08 2010 (r22647)
+++ trunk/libavcodec/mpegvideo_enc.c Tue Mar 23 18:58:39 2010 (r22648)
@@ -851,14 +851,18 @@ static int load_input_picture(MpegEncCon
pic->data[i]= pic_arg->data[i];
pic->linesize[i]= pic_arg->linesize[i];
}
- ff_alloc_picture(s, (Picture*)pic, 1);
+ if(ff_alloc_picture(s, (Picture*)pic, 1) < 0){
+ return -1;
+ }
}else{
i= ff_find_unused_picture(s, 0);
pic= (AVFrame*)&s->picture[i];
pic->reference= 3;
- ff_alloc_picture(s, (Picture*)pic, 0);
+ if(ff_alloc_picture(s, (Picture*)pic, 0) < 0){
+ return -1;
+ }
if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0]
&& pic->data[1] + INPLACE_OFFSET == pic_arg->data[1]
@@ -1048,7 +1052,7 @@ static int estimate_best_b_count(MpegEnc
return best_b_count;
}
-static void select_input_picture(MpegEncContext *s){
+static int select_input_picture(MpegEncContext *s){
int i;
for(i=1; i<MAX_PICTURE_COUNT; i++)
@@ -1184,7 +1188,9 @@ no_output_pic:
Picture *pic= &s->picture[i];
pic->reference = s->reordered_input_picture[0]->reference;
- ff_alloc_picture(s, pic, 0);
+ if(ff_alloc_picture(s, pic, 0) < 0){
+ return -1;
+ }
/* mark us unused / free shared pic */
if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_INTERNAL)
@@ -1214,6 +1220,7 @@ no_output_pic:
}else{
memset(&s->new_picture, 0, sizeof(Picture));
}
+ return 0;
}
int MPV_encode_picture(AVCodecContext *avctx,
@@ -1238,7 +1245,9 @@ int MPV_encode_picture(AVCodecContext *a
if(load_input_picture(s, pic_arg) < 0)
return -1;
- select_input_picture(s);
+ if(select_input_picture(s) < 0){
+ return -1;
+ }
/* output? */
if(s->new_picture.data[0]){
More information about the ffmpeg-cvslog
mailing list