diff options
author | Janne Grunau <janne-libav@jannau.net> | 2012-09-08 15:56:52 +0200 |
---|---|---|
committer | Janne Grunau <janne-libav@jannau.net> | 2012-09-19 19:58:15 +0200 |
commit | 01fc5d6609e31539684785295d6c10b84d70b215 (patch) | |
tree | cb48701e7fcfe2237a607932f93f732a52a1ac3b /libavcodec/mpegvideo.c | |
parent | 32c7589bb7ce6b8be733aa88e4786955c7c3a638 (diff) | |
download | ffmpeg-01fc5d6609e31539684785295d6c10b84d70b215.tar.gz |
mpegvideo: check ff_find_unused_picture() return value for errors
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 4682ab1121..f9f5c5263f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1341,6 +1341,10 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) pic = s->current_picture_ptr; } else { i = ff_find_unused_picture(s, 0); + if (i < 0) { + av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); + return i; + } pic = &s->picture[i]; } @@ -1404,6 +1408,10 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) /* Allocate a dummy frame */ i = ff_find_unused_picture(s, 0); + if (i < 0) { + av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); + return i; + } s->last_picture_ptr = &s->picture[i]; if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) { s->last_picture_ptr = NULL; @@ -1418,6 +1426,10 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) s->pict_type == AV_PICTURE_TYPE_B) { /* Allocate a dummy frame */ i = ff_find_unused_picture(s, 0); + if (i < 0) { + av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); + return i; + } s->next_picture_ptr = &s->picture[i]; if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) { s->next_picture_ptr = NULL; |