ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Tue Feb
24 20:49:07 2015 +0100| [ec7c1cd73319bbe75924f77363e710217f0878da] | 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 <michae...@gmx.at>
(cherry picked from commit c23a0e77dd492d6c794f89dbff3a438c95745e70)
Conflicts:
libavcodec/h264_slice.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec7c1cd73319bbe75924f77363e710217f0878da
---
libavcodec/h264.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 00f9e07..56858f4 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3712,7 +3712,7 @@ static int 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;
init_dequant_tables(h);
}
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
