virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()

Browse Source 
Fixes Ticket2812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-06 02:33:10 +02:00
parent b155fb08b8
commit bcd1c20612
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpegdec.c
View File

@@ -1182,6 +1182,7 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
int linesize = s->linesize[c]; int linesize = s->linesize[c];
int last_scan = 0; int last_scan = 0;
int16_t *quant_matrix = s->quant_matrixes[s->quant_sindex[0]]; int16_t *quant_matrix = s->quant_matrixes[s->quant_sindex[0]];
int bytes_per_pixel = 1 + (s->bits > 8);
av_assert0(ss>=0 && Ah>=0 && Al>=0); av_assert0(ss>=0 && Ah>=0 && Al>=0);
if (se < ss || se > 63) { if (se < ss || se > 63) {
@@ -1223,7 +1224,9 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
if (last_scan) { if (last_scan) {
s->dsp.idct_put(ptr, linesize, *block); s->dsp.idct_put(ptr, linesize, *block);
ptr += 8 >> s->avctx->lowres; if (s->bits & 7)
shift_output(s, ptr, linesize);
ptr += bytes_per_pixel*8 >> s->avctx->lowres;
} }
if (handle_rstn(s, 0)) if (handle_rstn(s, 0))
EOBRUN = 0; EOBRUN = 0;