[FFmpeg-cvslog] h264dec: drop a redundant check

Anton Khirnov git at videolan.org
Fri May 5 12:30:56 EEST 2017


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Dec 27 18:16:36 2016 +0100| [e7de05f98f630b5b3a5e441c8fa763e6d89b8851] | committer: Anton Khirnov

h264dec: drop a redundant check

Cropping parameters are already checked for validity during SPS parsing,
no need to check them again.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7de05f98f630b5b3a5e441c8fa763e6d89b8851
---

 libavcodec/h264_slice.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index db7628cf97..1b35c2baaf 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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;



More information about the ffmpeg-cvslog mailing list