har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h264: Only reinit quant tables if a new PPS is allowed

Browse Source 
Fixes null pointer dereference
Fixes: signal_sigsegv_3042097_3007_cov_1741463594_non_monotone_timestamps1.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-24 20:49:07 +01:00
parent f34aca8a16
commit c23a0e77dd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_slice.c
View File

@ -1497,7 +1497,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
} }
} }
if (h == h0 && h->dequant_coeff_pps != pps_id) { if (first_slice && h->dequant_coeff_pps != pps_id) {
h->dequant_coeff_pps = pps_id; h->dequant_coeff_pps = pps_id;
h264_init_dequant_tables(h); h264_init_dequant_tables(h);
} }