diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2002-10-31 09:24:25 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2002-10-31 09:24:25 +0000 |
| commit | f9745d55e6f6bceac52ad71dab19432a70e30a99 (patch) | |
| tree | 70e6b9e335e2a0b00091113bfb8067c1e895d760 | |
| parent | 01dc3aa48d1154069bf58b62964615e6a62864fe (diff) | |
| download | ffmpeg-f9745d55e6f6bceac52ad71dab19432a70e30a99.tar.gz | |
fixed 10l
Originally committed as revision 1124 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mjpeg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 292cd7d0fe..63da9a7904 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -1068,7 +1068,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) if (len < 5) 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; /* buggy AVID, it puts EOI only at every 10th frame */ @@ -1124,7 +1125,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) /* Apple MJPEG-A */ 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; if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */ { |