From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 18 May 2013 08:22:20 +0000 (+0200)
Subject: Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'
X-Git-Tag: android-x86-4.4-r1~3463
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7d84bb2bcca85c37dc2252f0dc5d585ee9c0011f;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'

* commit '4a4107b48944397c914aa39ee16a82fe44db8c4c':
  jpegls: factorize return paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

7d84bb2bcca85c37dc2252f0dc5d585ee9c0011f
diff --cc libavcodec/jpeglsdec.c
index 40301d421c,3616063bf1..c133cfb207
--- a/libavcodec/jpeglsdec.c
+++ b/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 */