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

jpegdec: give handle_rstn() a return code that indicates if restart did happen

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-09 23:45:31 +02:00
parent 776155ca29
commit 1c032e94d0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpegdec.c
View File

@ -736,9 +736,11 @@ static int decode_block_refinement(MJpegDecodeContext *s, int16_t *block,
#undef REFINE_BIT #undef REFINE_BIT
#undef ZERO_RUN #undef ZERO_RUN
static void handle_rstn(MJpegDecodeContext *s, int nb_components) static int handle_rstn(MJpegDecodeContext *s, int nb_components)
{ {
int i; int i;
int reset = 0;
if (s->restart_interval) { if (s->restart_interval) {
s->restart_count--; s->restart_count--;
if(s->restart_count == 0 && s->avctx->codec_id == AV_CODEC_ID_THP){ if(s->restart_count == 0 && s->avctx->codec_id == AV_CODEC_ID_THP){
@ -759,11 +761,13 @@ static void handle_rstn(MJpegDecodeContext *s, int nb_components)
if (get_bits_left(&s->gb) >= 8 && (get_bits(&s->gb, 8) & 0xF8) == 0xD0) { if (get_bits_left(&s->gb) >= 8 && (get_bits(&s->gb, 8) & 0xF8) == 0xD0) {
for (i = 0; i < nb_components; i++) /* reset dc */ for (i = 0; i < nb_components; i++) /* reset dc */
s->last_dc[i] = 1024; s->last_dc[i] = 1024;
reset = 1;
} else } else
skip_bits_long(&s->gb, pos - get_bits_count(&s->gb)); skip_bits_long(&s->gb, pos - get_bits_count(&s->gb));
} }
} }
} }
return reset;
} }
static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int predictor, int point_transform) static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int predictor, int point_transform)