aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-11 16:08:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-11 16:08:49 +0200
commit96747e6cbe755f448e978987e57096ef1452e340 (patch)
treef17e3b195f8e44b2bd724745041719fa0821167e /libavcodec/mjpegdec.c
parent7afa68d37df9c17c5ead6eb3e35348624c717e51 (diff)
downloadffmpeg-96747e6cbe755f448e978987e57096ef1452e340.tar.gz
mjpegdec: parse app-xfrm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index a4a9650276..65d9475d74 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1469,6 +1469,13 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
len --;
goto out;
}
+ if (id == AV_RL32("xfrm") && len > 0) {
+ s->xfrm = get_bits(&s->gb, 8);
+ if (s->avctx->debug & FF_DEBUG_PICT_INFO)
+ av_log(s->avctx, AV_LOG_INFO, "XFRM %d\n", s->xfrm);
+ len --;
+ goto out;
+ }
/* Apple MJPEG-A */
if ((s->start_code == APP1) && (len > (0x28 - 8))) {