summaryrefslogtreecommitdiff
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-06-16 11:38:50 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-06-19 01:36:30 +0200
commit18b4404dc35eef67620066e11086048b933c2e4c (patch)
tree616cdcfd42e5db5a55e06e54572e5f8584b02356 /libavcodec/imgconvert.c
parent0b2ecf8224cf882033737541cf3bd615dd414625 (diff)
lavc/imgconvert: fix check on av_image_check_size() return code in avpicture_get_size()
The documentation states that av_image_check_size() will return a negative value in case of error, while the check is done on ret != 0. Also return a proper error code rather than -1 in case the check fails.
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 495a1d07f7..e517812bbe 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -346,8 +346,8 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width,
int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height)
{
AVPicture dummy_pict;
- if(av_image_check_size(width, height, 0, NULL))
- return -1;
+ if (av_image_check_size(width, height, 0, NULL) < 0)
+ return AVERROR(EINVAL);
if (av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_PSEUDOPAL)
// do not include palette for these pseudo-paletted formats
return width * height;