Browse Source

mjpegdec: parse app-colr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
7afa68d37d
2 changed files with 8 additions and 0 deletions
  1. +7
    -0
      libavcodec/mjpegdec.c
  2. +1
    -0
      libavcodec/mjpegdec.h

+ 7
- 0
libavcodec/mjpegdec.c View File

@@ -1462,6 +1462,13 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
len -= 9;
goto out;
}
if (id == AV_RL32("colr") && len > 0) {
s->colr = get_bits(&s->gb, 8);
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_INFO, "COLR %d\n", s->colr);
len --;
goto out;
}

/* Apple MJPEG-A */
if ((s->start_code == APP1) && (len > (0x28 - 8))) {


+ 1
- 0
libavcodec/mjpegdec.h View File

@@ -65,6 +65,7 @@ typedef struct MJpegDecodeContext {
int rct; /* standard rct */
int pegasus_rct; /* pegasus reversible colorspace transform */
int bits; /* bits per component */
int colr;

int maxval;
int near; ///< near lossless bound (si 0 for lossless)


Loading…
Cancel
Save