diff options
author | Benoit Fouet <benoit.fouet@free.fr> | 2016-06-27 14:31:21 +0300 |
---|---|---|
committer | Benoit Fouet <benoit.fouet@free.fr> | 2016-06-30 10:24:39 +0300 |
commit | 4cc1ce4a91788a71670ea43fa0026b5a969e9e9e (patch) | |
tree | 9f4f4776c11e4f014f91f7189a02ed0ea350778c /libavcodec/h264_slice.c | |
parent | 3e8cda1eb1a8b4058a6bf40d3a224784a0153e3d (diff) |
h264: straighten dimensions check ff_h264_decode_seq_parameter_set
The MBS only flag was not taken into account when checking macroblock dimensions.
Also removes the unneeded check in init_dimensions for slices.
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r-- | libavcodec/h264_slice.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index adbd1d83f1..6babd669e0 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -889,23 +889,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; |