diff options
| author | Jason Garrett-Glaser <jason@x264.com> | 2011-06-21 04:16:33 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-23 00:17:03 +0200 |
| commit | f84c349b3b765f8d5c7a79a69ef9f8bb23cbfd83 (patch) | |
| tree | 3fd261e4688abd502d262a0b9aaa3f69d376a0ff | |
| parent | 26f732e21df7f79dbff040737b6030fd9a5ada11 (diff) | |
| download | ffmpeg-f84c349b3b765f8d5c7a79a69ef9f8bb23cbfd83.tar.gz | |
H.264: fix 4:4:4 cropping warning
(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)
| -rw-r--r-- | libavcodec/h264_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 75a0af7fff..61fb12ce0c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -396,6 +396,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ #endif sps->crop= get_bits1(&s->gb); if(sps->crop){ + int crop_limit = sps->chroma_format_idc == 3 ? 16 : 8; sps->crop_left = get_ue_golomb(&s->gb); sps->crop_right = get_ue_golomb(&s->gb); sps->crop_top = get_ue_golomb(&s->gb); @@ -403,7 +404,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ if(sps->crop_left || sps->crop_top){ av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); } - if(sps->crop_right >= (8<<CHROMA444) || sps->crop_bottom >= (8<<CHROMA444)){ + if(sps->crop_right >= crop_limit || sps->crop_bottom >= crop_limit){ av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n"); } }else{ |