diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-28 21:19:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-30 17:58:08 +0200 |
| commit | b3332a182f8ba33a34542e4a0370f38b914ccf7d (patch) | |
| tree | e64ea3bae2d077a04d8559b5903b2dba8a99b1d2 /libavcodec/idctdsp.h | |
| parent | 1aa519245193485cd74a52aacc99fd3fec58d0b4 (diff) | |
| download | ffmpeg-streaming-b3332a182f8ba33a34542e4a0370f38b914ccf7d.zip ffmpeg-streaming-b3332a182f8ba33a34542e4a0370f38b914ccf7d.tar.gz | |
avcodec/idctdsp: Transmit studio_profile to init instead of using AVCodecContext profile
These 2 fields are not always the same, it is simpler to always use the same field
for detecting studio profile
Fixes: null pointer dereference
Fixes: ffmpeg_crash_3.avi
Found-by: Thuan Pham <thuanpv@comp.nus.edu.sg>, Marcel Böhme, Andrew Santosa and Alexandru RazvanCaciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/idctdsp.h')
| -rw-r--r-- | libavcodec/idctdsp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h index 26221f6..ca21a31 100644 --- a/libavcodec/idctdsp.h +++ b/libavcodec/idctdsp.h @@ -95,6 +95,8 @@ typedef struct IDCTDSPContext { */ uint8_t idct_permutation[64]; enum idct_permutation_type perm_type; + + int mpeg4_studio_profile; } IDCTDSPContext; void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, |
