[FFmpeg-devel] [PATCH 5/7] avcodec/h263dec: Return the correct error code in explode mode

Michael Niedermayer michael at niedermayer.cc
Thu Dec 15 23:28:26 EET 2016


On Thu, Dec 15, 2016 at 09:35:54PM +0100, Paul B Mahol wrote:
> On 12/15/16, Michael Niedermayer <michael at niedermayer.cc> wrote:
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavcodec/h263dec.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
> > index d0da1d31c1..75fc688e78 100644
> > --- a/libavcodec/h263dec.c
> > +++ b/libavcodec/h263dec.c
> > @@ -713,7 +713,7 @@ frame_end:
> >      }
> >
> >      if (slice_ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
> > -        return ret;
> > +        return slice_ret;
> >      else
> >          return get_consumed_bytes(s, buf_size);
> >  }
> > --
> > 2.11.0
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> 
> lgtm

applied

thx

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

Dictatorship: All citizens are under surveillance, all their steps and
actions recorded, for the politicians to enforce control.
Democracy: All politicians are under surveillance, all their steps and
actions recorded, for the citizens to enforce control.
-------------- 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/20161215/558a81f7/attachment.sig>


More information about the ffmpeg-devel mailing list