H.264: fix 4:4:4 cropping warning
authorJason Garrett-Glaser <jason@x264.com>
Tue, 21 Jun 2011 11:16:33 +0000 (04:16 -0700)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Jun 2011 22:17:03 +0000 (00:17 +0200)
(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)

libavcodec/h264_ps.c

index 75a0af7..61fb12c 100644 (file)
@@ -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{