[FFmpeg-cvslog] mpegvideo: check ff_find_unused_picture() return value for errors
Janne Grunau
git at videolan.org
Thu Sep 20 04:44:41 CEST 2012
ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Sat Sep 8 15:56:52 2012 +0200| [01fc5d6609e31539684785295d6c10b84d70b215] | committer: Janne Grunau
mpegvideo: check ff_find_unused_picture() return value for errors
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01fc5d6609e31539684785295d6c10b84d70b215
---
libavcodec/mpegvideo.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4682ab1..f9f5c52 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;
More information about the ffmpeg-cvslog
mailing list