diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d613afa6ec..dfa2f8d25a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3115,12 +3115,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->avctx->codec && diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index a06e3dd65b..e278781b55 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -376,7 +376,12 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) } sps->bit_depth_luma = get_ue_golomb(&h->gb) + 8; sps->bit_depth_chroma = get_ue_golomb(&h->gb) + 8; - if (sps->bit_depth_luma > 14U || sps->bit_depth_chroma > 14U || sps->bit_depth_luma != sps->bit_depth_chroma) { + if (sps->bit_depth_chroma != sps->bit_depth_luma) { + avpriv_request_sample(h->avctx, + "Different chroma and luma bit depth"); + goto fail; + } + if (sps->bit_depth_luma > 14U || sps->bit_depth_chroma > 14U) { av_log(h->avctx, AV_LOG_ERROR, "illegal bit depth value (%d, %d)\n", sps->bit_depth_luma, sps->bit_depth_chroma); goto fail;