[FFmpeg-cvslog] avcodec/jpeg2000dec: Skip SOP

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 15 02:32:45 2015 +0200| [a58f1bcc4cbe41747ed88f6abc0b01932ba238a9] | committer: Michael Niedermayer

avcodec/jpeg2000dec: Skip SOP

Fixes Ticket4625

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a58f1bcc4cbe41747ed88f6abc0b01932ba238a9
---

 libavcodec/jpeg2000dec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index a4f5c8c..d5abc42 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -812,6 +812,9 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
         }
     }
 
+    if (bytestream2_peek_be32(&s->g) == 0xFF910004)
+        bytestream2_skip(&s->g, 6);
+
     if (!(ret = get_bits(s, 1))) {
         jpeg2000_flush(s);
         return 0;