h264: fully check cropping amount from sps
authorVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 26 Aug 2014 00:40:19 +0000 (20:40 -0400)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 26 Aug 2014 17:31:29 +0000 (13:31 -0400)
Even if sps.crop is true, the cropping amount may be zero.
Fixes a sample with a valid but broken container cropping.

libavcodec/h264_slice.c

index 83d3426..69aed1d 100644 (file)
@@ -1028,9 +1028,11 @@ static int init_dimensions(H264Context *h)
 {
     int width  = h->width  - (h->sps.crop_right + h->sps.crop_left);
     int height = h->height - (h->sps.crop_top   + h->sps.crop_bottom);
+    int crop_present = h->sps.crop_left  || h->sps.crop_top ||
+                       h->sps.crop_right || h->sps.crop_bottom;
 
     /* handle container cropping */
-    if (!h->sps.crop &&
+    if (!crop_present &&
         FFALIGN(h->avctx->width,  16) == h->width &&
         FFALIGN(h->avctx->height, 16) == h->height) {
         width  = h->avctx->width;