diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 20:59:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 20:59:51 +0100 |
| commit | 27f55beba2bf9c94996660556543dce1b3ed04b1 (patch) | |
| tree | 03c467d651b1288e225c3a6922e967ae1a420493 /libavcodec/h264_ps.c | |
| parent | d42ec8433c687fcbccefa51a7716d81920218e4f (diff) | |
| parent | 614b9e4db8f3d7c23fc0410fc04745a727a82f4e (diff) | |
| download | ffmpeg-27f55beba2bf9c94996660556543dce1b3ed04b1.tar.gz | |
Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'
* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
h264: use avpriv_request_sample for chroma_format_idc
Conflicts:
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 22ccc52c09..91d73ccbdb 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -366,9 +366,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) sps->profile_idc == 128 || sps->profile_idc == 144) { sps->chroma_format_idc = get_ue_golomb_31(&h->gb); if (sps->chroma_format_idc > 3U) { - av_log(h->avctx, AV_LOG_ERROR, - "chroma_format_idc %d is illegal\n", - sps->chroma_format_idc); + avpriv_request_sample(h->avctx, "chroma_format_idc %u", + sps->chroma_format_idc); goto fail; } else if (sps->chroma_format_idc == 3) { sps->residual_color_transform_flag = get_bits1(&h->gb); |