Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'

[ffmpeg] / libavcodec / mjpegdec.h

diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index deacabe7528cbc15345c7815042d2a653c3015bb..28d3e4aa7d4aae5e88a3fc223b11b297a202432b 100644 (file)
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -62,8 +62,8 @@ typedef struct MJpegDecodeContext {
     int ls;
     int progressive;
     int rgb;
-    int upscale_h;
-    int upscale_v;
+    uint8_t upscale_h[4];
+    uint8_t upscale_v[4];
     int rct;            /* standard rct */
     int pegasus_rct;    /* pegasus reversible colorspace transform */
     int bits;           /* bits per component */