[FFmpeg-devel] [PATCH 1/2] mjpegdec: factor handle_rstn() out

[Michael Niedermayer]

On Tue, Dec 25, 2012 at 11:39:36AM +0100, Alexander Strasser wrote:
> Hi Michael,
> 
> Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  libavcodec/mjpegdec.c |   50 +++++++++++++++++++++++++++----------------------
> >  1 file changed, 28 insertions(+), 22 deletions(-)
> 
>   LGTM

will apply soon, unless i hear objections


> 
> > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
> > index 625dce4..cf7dd8c 100644
> > --- a/libavcodec/mjpegdec.c
> > +++ b/libavcodec/mjpegdec.c
> > @@ -727,6 +727,33 @@ static int decode_block_refinement(MJpegDecodeContext *s, DCTELEM *block,
> >  #undef REFINE_BIT
> >  #undef ZERO_RUN
> >  
> > +static void handle_rstn(MJpegDecodeContext *s, int nb_components)
> > +{
> > +    int i;
> > +    if (s->restart_interval) {
> > +        s->restart_count--;
> > +        if(s->restart_count == 0 && s->avctx->codec_id == AV_CODEC_ID_THP){
>             ^                                                               ^
>   While moving that code anyway you might want to insert spaces at the
> places marked above. Would better fit with the surrounding code.

doesnt belong in this patch IMO

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

During times of universal deceit, telling the truth becomes a
revolutionary act. -- George Orwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121225/5c894a2b/attachment.asc>