generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mjpegdec: parse adobe_transform

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-27 20:02:20 +01:00
parent 7e8be7081f
commit 681e72a668
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpegdec.c
View File

@ -1515,12 +1515,12 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
} }
if (id == AV_RB32("Adob") && (get_bits(&s->gb, 8) == 'e')) { 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); /* version */
skip_bits(&s->gb, 16); /* flags0 */ skip_bits(&s->gb, 16); /* flags0 */
skip_bits(&s->gb, 16); /* flags1 */ 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; len -= 7;
goto out; goto out;
} }

1
libavcodec/mjpegdec.h
View File

@ -69,6 +69,7 @@ typedef struct MJpegDecodeContext {
int bits; /* bits per component */ int bits; /* bits per component */
int colr; int colr;
int xfrm; int xfrm;
int adobe_transform;
int maxval; int maxval;
int near; ///< near lossless bound (si 0 for lossless) int near; ///< near lossless bound (si 0 for lossless)