[FFmpeg-cvslog] avcodec/h264: Only reinit quant tables if a new PPS is allowed
Michael Niedermayer
git at videolan.org
Tue Feb 24 21:30:33 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 20:49:07 2015 +0100| [c23a0e77dd492d6c794f89dbff3a438c95745e70] | committer: Michael Niedermayer
avcodec/h264: Only reinit quant tables if a new PPS is allowed
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c23a0e77dd492d6c794f89dbff3a438c95745e70
---
libavcodec/h264_slice.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 54bc7bf..2b8d27f 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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;
h264_init_dequant_tables(h);
}
More information about the ffmpeg-cvslog
mailing list