From 09bad7e3ca6baface20ad4d67bd5b99cd79694b1 Mon Sep 17 00:00:00 2001 From: Jai Menon Date: Tue, 10 Nov 2009 14:48:32 +0000 Subject: [PATCH] Handle JPEG2000 frames stored in the Quicktime container. Fixes issue 1525. Originally committed as revision 20500 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/libopenjpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c index 3a3a127327..f1e047437c 100644 --- a/libavcodec/libopenjpeg.c +++ b/libavcodec/libopenjpeg.c @@ -80,6 +80,10 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, (AV_RB32(buf + 8) == JP2_SIG_VALUE)) { dec = opj_create_decompress(CODEC_JP2); } else { + // If the AVPacket contains a jp2c box, then skip to + // the starting byte of the codestream. + if (AV_RB32(buf + 4) == AV_RB32("jp2c")) + buf += 8; dec = opj_create_decompress(CODEC_J2K); }