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

fixed 10l

Browse Source 
Originally committed as revision 1124 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Alex Beregszaszi 22 years ago
parent 01dc3aa48d
commit f9745d55e6
1 changed files with 4 additions and 2 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. 6
      libavcodec/mjpeg.c

6
libavcodec/mjpeg.c
Unescape View File

@ -1068,7 +1068,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
if (len < 5) if (len < 5)
return -1; return -1;
id = be2me_32((get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16)); id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
id = be2me_32(id);
len -= 6; len -= 6;
/* buggy AVID, it puts EOI only at every 10th frame */ /* buggy AVID, it puts EOI only at every 10th frame */
@ -1124,7 +1125,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
/* Apple MJPEG-A */ /* Apple MJPEG-A */
if ((s->start_code == APP1) && (len > (0x28 - 8))) if ((s->start_code == APP1) && (len > (0x28 - 8)))
{ {
id = be2me_32((get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16)); id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
id = be2me_32(id);
len -= 4; len -= 4;
if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */ if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */
{ {

Write Preview
Loading…
Cancel
Save