Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-03-17 05:25:18 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2017-03-20 03:38:04 +0300
commit23f3f92361a3db53e595de33cfd5440f53bee220 (patch)
tree3353deac0ecfa30c7bb27fcf7728a6e10f0e6537 /libavcodec/mjpegdec.h
parent656a17e126c08ac8ed71da99047f13cf3e6c2a7c (diff)
avcodec/mjpegdec: quant_matrixes can be up to 65535, use uint16_t
Fixes invalid shift Fixes: 870/clusterfuzz-testcase-5649105424482304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpegdec.h')
-rw-r--r--libavcodec/mjpegdec.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index fb811294a1..024cedcb5a 100644
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -50,7 +50,7 @@ typedef struct MJpegDecodeContext {
int buffer_size;
uint8_t *buffer;
- int16_t quant_matrixes[4][64];
+ uint16_t quant_matrixes[4][64];
VLC vlcs[3][4];
int qscale[4]; ///< quantizer scale calculated from quant_matrixes