Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  jpegdec: actually search for and parse RSTn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Michael Niedermayer 14 years ago
parent 88084eecdf 8c0fa61a97
commit 14d5e214bf
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/mjpegdec.c

2
libavcodec/mjpegdec.c
Unescape View File

@ -881,7 +881,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
} }
} }
if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){/* skip RSTn */ if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){ /* skip RSTn */
--s->restart_count; --s->restart_count;
align_get_bits(&s->gb); align_get_bits(&s->gb);
while(show_bits(&s->gb, 8) == 0xFF) while(show_bits(&s->gb, 8) == 0xFF)

Write Preview
Loading…
Cancel
Save