Commit f35a41ff authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Make avpicture_fill() return a meaningful error code.

Originally committed as revision 25687 to svn://
parent 24409b50
......@@ -511,12 +511,13 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt,
int avpicture_fill(AVPicture *picture, uint8_t *ptr,
enum PixelFormat pix_fmt, int width, int height)
int ret;
if(av_image_check_size(width, height, 0, NULL))
return -1;
if ((ret = av_image_check_size(width, height, 0, NULL)) < 0)
return ret;
if (av_image_fill_linesizes(picture->linesize, pix_fmt, width))
return -1;
if ((ret = av_image_fill_linesizes(picture->linesize, pix_fmt, width)) < 0)
return ret;
return av_image_fill_pointers(picture->data, pix_fmt, height, ptr, picture->linesize);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment