virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-18 10:22:20 +02:00
commit 7d84bb2bcc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/jpeglsdec.c
View File

@ -277,7 +277,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
int i, t = 0; int i, t = 0;
uint8_t *zero, *last, *cur; uint8_t *zero, *last, *cur;
JLSState *state; JLSState *state;
int off = 0, stride = 1, width, shift; int off = 0, stride = 1, width, shift, ret = 0;
zero = av_mallocz(s->picture.linesize[0]); zero = av_mallocz(s->picture.linesize[0]);
last = zero; last = zero;
@ -353,9 +353,8 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
} }
} else if (ilv == 2) { /* sample interleaving */ } else if (ilv == 2) { /* sample interleaving */
avpriv_report_missing_feature(s->avctx, "Sample interleaved images"); avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
av_free(state); ret = AVERROR_PATCHWELCOME;
av_free(zero); goto end;
return AVERROR_PATCHWELCOME;
} }
if (shift) { /* we need to do point transform or normalize samples */ if (shift) { /* we need to do point transform or normalize samples */
@ -381,10 +380,12 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
} }
} }
} }
end:
av_free(state); av_free(state);
av_free(zero); av_free(zero);
return 0; return ret;
} }
AVCodec ff_jpegls_decoder = { AVCodec ff_jpegls_decoder = {