From 3dae9d13e51c4b0a8b181e4f0a2b460e8465eeec Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sun, 29 Dec 2013 10:54:32 +0100 Subject: [PATCH] lavc/mjpegenc: use proper error codes. (cherry picked from commit 2ebaadf35c9387610ca1eb7e94c171050562a77c) Signed-off-by: Michael Niedermayer --- libavcodec/mjpegenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 8963289456..eea4183b52 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -46,12 +46,12 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s) if (s->width > 65500 || s->height > 65500) { av_log(s, AV_LOG_ERROR, "JPEG does not support resolutions above 65500x65500\n"); - return -1; + return AVERROR(EINVAL); } m = av_malloc(sizeof(MJpegContext)); if (!m) - return -1; + return AVERROR(ENOMEM); s->min_qcoeff=-1023; s->max_qcoeff= 1023; @@ -503,7 +503,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, //CODEC_FLAG_EMU_EDGE have to be cleared if(s->avctx->flags & CODEC_FLAG_EMU_EDGE) - return -1; + return AVERROR(EINVAL); pic = av_frame_alloc(); if (!pic)