Module: libav Branch: master Commit: ed2d7d5868a4a5d914f1e5488d63ea696a3b2937
Author: Michael Niedermayer <[email protected]> Committer: Janne Grunau <[email protected]> Date: Sun Nov 18 18:46:05 2012 +0100 ff_h264_direct_ref_list_init: fix B slice check. Fixes null pointer dereference. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind --- libavcodec/h264_direct.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index a33efa5..bf44495 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -134,7 +134,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ h->col_fieldoff = 2 * h->ref_list[1][0].f.reference - 3; } - if (cur->f.pict_type != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred) + if (h->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred) return; for(list=0; list<2; list++){ _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
