diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-27 20:02:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-27 20:13:48 +0100 |
| commit | 681e72a668abecea4bb34cdb8c7d5d045147a3d9 (patch) | |
| tree | 1b38b00244110b1a2128f3792b04129cbcaf68cb | |
| parent | 7e8be7081fed78d60443d336d7fb9126b76da461 (diff) | |
| download | ffmpeg-streaming-681e72a668abecea4bb34cdb8c7d5d045147a3d9.zip ffmpeg-streaming-681e72a668abecea4bb34cdb8c7d5d045147a3d9.tar.gz | |
avcodec/mjpegdec: parse adobe_transform
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 22a1067..3469f70 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1515,12 +1515,12 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) } if (id == AV_RB32("Adob") && (get_bits(&s->gb, 8) == 'e')) { - if (s->avctx->debug & FF_DEBUG_PICT_INFO) - av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found\n"); skip_bits(&s->gb, 16); /* version */ skip_bits(&s->gb, 16); /* flags0 */ skip_bits(&s->gb, 16); /* flags1 */ - skip_bits(&s->gb, 8); /* transform */ + s->adobe_transform = get_bits(&s->gb, 8); + if (s->avctx->debug & FF_DEBUG_PICT_INFO) + av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found, transform=%d\n", s->adobe_transform); len -= 7; goto out; } diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 1317404..77bbfed 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -69,6 +69,7 @@ typedef struct MJpegDecodeContext { int bits; /* bits per component */ int colr; int xfrm; + int adobe_transform; int maxval; int near; ///< near lossless bound (si 0 for lossless) |
