Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 08:22:20 +0000 (10:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 08:22:39 +0000 (10:22 +0200)
* commit '4a4107b48944397c914aa39ee16a82fe44db8c4c':
  jpegls: factorize return paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/jpeglsdec.c

@@@ -277,11 -274,11 +277,11 @@@ int ff_jpegls_decode_picture(MJpegDecod
      int i, t = 0;
      uint8_t *zero, *last, *cur;
      JLSState *state;
-     int off = 0, stride = 1, width, shift;
+     int off = 0, stride = 1, width, shift, ret = 0;
  
 -    zero = av_mallocz(s->picture_ptr->linesize[0]);
 +    zero = av_mallocz(s->picture.linesize[0]);
      last = zero;
 -    cur  = s->picture_ptr->data[0];
 +    cur  = s->picture.data[0];
  
      state = av_mallocz(sizeof(JLSState));
      /* initialize JPEG-LS state from JPEG parameters */