Commit 27f55beb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '614b9e4d'

* commit '614b9e4d':
  h264: use avpriv_request_sample for chroma_format_idc

Conflicts:
	libavcodec/h264_ps.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d42ec843 614b9e4d
...@@ -366,8 +366,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) ...@@ -366,8 +366,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h)
sps->profile_idc == 128 || sps->profile_idc == 144) { sps->profile_idc == 128 || sps->profile_idc == 144) {
sps->chroma_format_idc = get_ue_golomb_31(&h->gb); sps->chroma_format_idc = get_ue_golomb_31(&h->gb);
if (sps->chroma_format_idc > 3U) { if (sps->chroma_format_idc > 3U) {
av_log(h->avctx, AV_LOG_ERROR, avpriv_request_sample(h->avctx, "chroma_format_idc %u",
"chroma_format_idc %d is illegal\n",
sps->chroma_format_idc); sps->chroma_format_idc);
goto fail; goto fail;
} else if (sps->chroma_format_idc == 3) { } else if (sps->chroma_format_idc == 3) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment