[FFmpeg-devel] [PATCH 2/2] avcodec/snowenc: Replace "return -1" by named constants

Michael Niedermayer michael at niedermayer.cc
Sun Sep 24 01:07:00 EEST 2017


On Fri, Sep 22, 2017 at 10:14:01PM -0300, James Almer wrote:
> On 9/22/2017 10:01 PM, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavcodec/snowenc.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
> > index bb113d0a2b..f5497f958c 100644
> > --- a/libavcodec/snowenc.c
> > +++ b/libavcodec/snowenc.c
> > @@ -50,7 +50,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
> >         && (avctx->flags & AV_CODEC_FLAG_QSCALE)
> >         && avctx->global_quality == 0){
> >          av_log(avctx, AV_LOG_ERROR, "The 9/7 wavelet is incompatible with lossless mode.\n");
> > -        return -1;
> > +        return AVERROR(EINVAL);
> >      }
> >  #if FF_API_MOTION_EST
> >  FF_DISABLE_DEPRECATION_WARNINGS
> > @@ -107,8 +107,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
> >              return AVERROR(ENOMEM);
> >      }
> >      if((avctx->flags&AV_CODEC_FLAG_PASS2) || !(avctx->flags&AV_CODEC_FLAG_QSCALE)){
> > -        if(ff_rate_control_init(&s->m) < 0)
> > -            return -1;
> > +        if((ret = ff_rate_control_init(&s->m)) < 0)
> > +            return ret;
> 
> ret = foo();
> if (ret < 0)
>     return ret;
> 
> No more combined assignment and comparisons for new code if possible.
> It's too prone to mistakes.

I dont make that mistake (anymore), but yes it gives a bad example.
Will change


> 
> >      }
> >      s->pass1_rc= !(avctx->flags & (AV_CODEC_FLAG_QSCALE|AV_CODEC_FLAG_PASS2));
> >  
> > @@ -130,7 +130,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
> >          break;*/
> >      default:
> >          av_log(avctx, AV_LOG_ERROR, "pixel format not supported\n");
> > -        return -1;
> > +        return AVERROR_PATCHWELCOME;
> >      }
> >      avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
> >  
> > @@ -833,7 +833,7 @@ static int encode_subband_c0run(SnowContext *s, SubBand *b, const IDWTELEM *src,
> >          for(y=0; y<h; y++){
> >              if(s->c.bytestream_end - s->c.bytestream < w*40){
> >                  av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
> > -                return -1;
> > +                return AVERROR(ENOMEM);
> >              }
> >              for(x=0; x<w; x++){
> >                  int v, p=0;
> > 
> 
> Should be good aside from the above.

will apply

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170924/681d4d1b/attachment.sig>


More information about the ffmpeg-devel mailing list