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

mjpegdec: parse app-xfrm

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-11 16:08:49 +02:00
parent 7afa68d37d
commit 96747e6cbe
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mjpegdec.c
View File

@ -1469,6 +1469,13 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
len --; len --;
goto out; 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 */ /* Apple MJPEG-A */
if ((s->start_code == APP1) && (len > (0x28 - 8))) { if ((s->start_code == APP1) && (len > (0x28 - 8))) {

1
libavcodec/mjpegdec.h
View File

@ -66,6 +66,7 @@ typedef struct MJpegDecodeContext {
int pegasus_rct; /* pegasus reversible colorspace transform */ int pegasus_rct; /* pegasus reversible colorspace transform */
int bits; /* bits per component */ int bits; /* bits per component */
int colr; int colr;
int xfrm;
int maxval; int maxval;
int near; ///< near lossless bound (si 0 for lossless) int near; ///< near lossless bound (si 0 for lossless)