From bfd26b7ce6efea594f2b99441d900419df3af638 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 28 Nov 2013 10:54:35 +0100 Subject: h264: reject mismatching luma/chroma bit depths during sps parsing There is no point in delaying the check and it avoids bugs with a half-initialized context. Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org --- libavcodec/h264.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libavcodec/h264.c') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e3dfbfb193..c0dfa3d638 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3053,12 +3053,6 @@ static int h264_set_parameter_from_sps(H264Context *h) if (h->avctx->has_b_frames < 2) h->avctx->has_b_frames = !h->low_delay; - if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) { - avpriv_request_sample(h->avctx, - "Different chroma and luma bit depth"); - return AVERROR_PATCHWELCOME; - } - if (h->avctx->bits_per_raw_sample != h->sps.bit_depth_luma || h->cur_chroma_format_idc != h->sps.chroma_format_idc) { if (h->sps.bit_depth_luma >= 8 && h->sps.bit_depth_luma <= 10) { -- cgit v1.2.3