From eaa9d2cd6b8c1e2722d5bfc56ea67fde865200ce Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 2 Feb 2013 21:11:54 +0100 Subject: [PATCH] h264: skip error concealment when SPS and slices are mismatching Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 695af8eed642ff0104834495652d1ee784a4c14d) Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index da144db987..0aab4e7328 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2351,7 +2351,7 @@ static int field_end(H264Context *h, int in_setup) * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (!FIELD_PICTURE && h->current_slice) + if (!FIELD_PICTURE && h->current_slice && !h->sps.new) ff_er_frame_end(s); ff_MPV_frame_end(s);