Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/mjpegdec.c7
-rw-r--r--libavcodec/mjpegdec.h1
2 files changed, 8 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))) {
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index 6f82706537..0cb26f1c81 100644
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -66,6 +66,7 @@ typedef struct MJpegDecodeContext {
int pegasus_rct; /* pegasus reversible colorspace transform */
int bits; /* bits per component */
int colr;
+ int xfrm;
int maxval;
int near; ///< near lossless bound (si 0 for lossless)