h264dec: drop a redundant check
authorAnton Khirnov <anton@khirnov.net>
Tue, 27 Dec 2016 17:16:36 +0000 (18:16 +0100)
committerAnton Khirnov <anton@khirnov.net>
Mon, 9 Jan 2017 12:21:13 +0000 (13:21 +0100)
Cropping parameters are already checked for validity during SPS parsing,
no need to check them again.

libavcodec/h264_slice.c

index db7628c..1b35c2b 100644 (file)
@@ -803,23 +803,6 @@ static int init_dimensions(H264Context *h)
         height = h->avctx->height;
     }
 
-    if (width <= 0 || height <= 0) {
-        av_log(h->avctx, AV_LOG_ERROR, "Invalid cropped dimensions: %dx%d.\n",
-               width, height);
-        if (h->avctx->err_recognition & AV_EF_EXPLODE)
-            return AVERROR_INVALIDDATA;
-
-        av_log(h->avctx, AV_LOG_WARNING, "Ignoring cropping information.\n");
-        sps->crop_bottom =
-        sps->crop_top    =
-        sps->crop_right  =
-        sps->crop_left   =
-        sps->crop        = 0;
-
-        width  = h->width;
-        height = h->height;
-    }
-
     h->avctx->coded_width  = h->width;
     h->avctx->coded_height = h->height;
     h->avctx->width        = width;