From: Michael Niedermayer <michael@niedermayer.cc>
Date: Mon, 31 Dec 2018 17:59:49 +0000 (+0100)
Subject: avcodec/eacmv: Return more specific error codes and forward error codes
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3ee323583993cab68bf9d245906d9778273504fa;p=ffmpeg

avcodec/eacmv: Return more specific error codes and forward error codes

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index bf4404ce426..6f39d72b88d 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -191,12 +191,12 @@ static int cmv_decode_frame(AVCodecContext *avctx,
         if (ret < 0)
             return ret;
         if (size > buf_end - buf - EA_PREAMBLE_SIZE)
-            return -1;
+            return AVERROR_INVALIDDATA;
         buf += size;
     }
 
-    if (av_image_check_size(s->width, s->height, 0, s->avctx))
-        return -1;
+    if ((ret = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
+        return ret;
 
     if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
         return ret;