Signed-off-by: Paul B Mahol <one...@gmail.com> --- libavfilter/vf_tile.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index 87e0b940cf..368e4f1a82 100644 --- a/libavfilter/vf_tile.c +++ b/libavfilter/vf_tile.c @@ -44,8 +44,6 @@ typedef struct TileContext { uint8_t rgba_color[4]; } TileContext; -#define REASONABLE_SIZE 1024 - #define OFFSET(x) offsetof(TileContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM @@ -68,12 +66,6 @@ static av_cold int init(AVFilterContext *ctx) { TileContext *tile = ctx->priv; - if (tile->w > REASONABLE_SIZE || tile->h > REASONABLE_SIZE) { - av_log(ctx, AV_LOG_ERROR, "Tile size %ux%u is insane.\n", - tile->w, tile->h); - return AVERROR(EINVAL); - } - if (tile->nb_frames == 0) { tile->nb_frames = tile->w * tile->h; } else if (tile->nb_frames > tile->w * tile->h) { @@ -98,12 +90,12 @@ static int config_props(AVFilterLink *outlink) const unsigned total_margin_w = (tile->w - 1) * tile->padding + 2*tile->margin; const unsigned total_margin_h = (tile->h - 1) * tile->padding + 2*tile->margin; - if (inlink->w > (INT_MAX - total_margin_w) / tile->w) { + if (inlink->w > (INT16_MAX - total_margin_w) / tile->w) { av_log(ctx, AV_LOG_ERROR, "Total width %ux%u is too much.\n", tile->w, inlink->w); return AVERROR(EINVAL); } - if (inlink->h > (INT_MAX - total_margin_h) / tile->h) { + if (inlink->h > (INT16_MAX - total_margin_h) / tile->h) { av_log(ctx, AV_LOG_ERROR, "Total height %ux%u is too much.\n", tile->h, inlink->h); return AVERROR(EINVAL); -- 2.11.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel