[FFmpeg-cvslog] lavc/mjpegenc: use proper error codes.
Nicolas George
git at videolan.org
Mon Dec 30 13:37:39 CET 2013
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Sun Dec 29 10:54:32 2013 +0100| [2ebaadf35c9387610ca1eb7e94c171050562a77c] | committer: Nicolas George
lavc/mjpegenc: use proper error codes.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ebaadf35c9387610ca1eb7e94c171050562a77c
---
libavcodec/mjpegenc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 7837ce9..518a7d5 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -48,12 +48,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;
@@ -545,7 +545,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)
More information about the ffmpeg-cvslog
mailing list