diff mbox

[FFmpeg-devel,16/16] avcodec/eacmv: Return more specific error codes and forward error codes

Message ID 20181231182246.14327-16-michael@niedermayer.cc
State Accepted
Commit 3ee323583993cab68bf9d245906d9778273504fa
Headers show

Commit Message

Michael Niedermayer Dec. 31, 2018, 6:22 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/eacmv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Paul B Mahol Jan. 1, 2019, 11:03 a.m. UTC | #1 
On 12/31/18, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/eacmv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
> index bf4404ce42..6f39d72b88 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;
> --
> 2.20.1
>

All changes in set are very trivial, so LGTM.
Michael Niedermayer Jan. 1, 2019, 11:45 a.m. UTC | #2 
On Tue, Jan 01, 2019 at 12:03:36PM +0100, Paul B Mahol wrote:
> On 12/31/18, Michael Niedermayer <michael@niedermayer.cc> wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/eacmv.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
> > index bf4404ce42..6f39d72b88 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;
> > --
> > 2.20.1
> >
> 
> All changes in set are very trivial, so LGTM.

will apply

thanks

[...]
diff mbox

Patch

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index bf4404ce42..6f39d72b88 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;