diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-11-28 10:54:35 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-01-06 08:23:45 +0100 |
commit | bfd26b7ce6efea594f2b99441d900419df3af638 (patch) | |
tree | 4eb352baac6ae985e1324e01092593d3bec96dff /libavcodec/h264.c | |
parent | 9a026c72982faf20e1c8dfbe48f0b312cdea69c8 (diff) |
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
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 0 insertions, 6 deletions
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) { |