[FFmpeg-devel] [PATCH]lavc/mpegvideo_enc: Do not write an extra RST tag after final jpeg slice

[Carl Eugen Hoyos]

Am Di., 21. Jan. 2020 um 14:19 Uhr schrieb Michael Niedermayer
<michael at niedermayer.cc>:

> >  mjpegenc_common.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 5c76a5298352eb275764526ebe2d7312c98d1c26  0001-lavc-mjpegenc-Fix-not-writing-RST-tag-after-final-sl.patch
> > From f50caafa55f54a4987a73cccb2b954e3e137781e Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg at gmail.com>
> > Date: Mon, 20 Jan 2020 23:57:38 +0100
> > Subject: [PATCH] lavc/mjpegenc: Fix not writing RST tag after final slice.
> >
> > Fixes ticket #8412.
> > ---
> >  libavcodec/mjpegenc_common.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
> > index 31868c9bed..3038ebde6e 100644
> > --- a/libavcodec/mjpegenc_common.c
> > +++ b/libavcodec/mjpegenc_common.c
> > @@ -573,7 +573,7 @@ int ff_mjpeg_encode_stuffing(MpegEncContext *s)
> >
> >      ff_mjpeg_escape_FF(pbc, s->esc_pos);
> >
> > -    if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height)
> > +    if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height - 1)
> >          put_marker(pbc, RST0 + (mb_y&7));
> >      s->esc_pos = put_bits_count(pbc) >> 3;
> >  fail:
>
> LGTM

Patch applied.

Thank you, Carl Eugen