From 1aadcedcfb4465934d0a7ead2860c61517157965 Mon Sep 17 00:00:00 2001 From: Attila Nagy Date: Tue, 12 Apr 2011 15:01:22 +0300 Subject: [PATCH] Fix encoder range check for frame width and height 14 bits available in the bistream => valid range [1..16383] Removed unused local vars. Change-Id: Icf3385e47a9fa13af70053129c2248671f285583 --- vp8/vp8_cx_iface.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 2622738..39b1e5e 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -137,8 +137,8 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, const vpx_codec_enc_cfg_t *cfg, const struct vp8_extracfg *vp8_cfg) { - RANGE_CHECK(cfg, g_w, 1, 16384); - RANGE_CHECK(cfg, g_h, 1, 16384); + RANGE_CHECK(cfg, g_w, 1, 16383); /* 14 bits available */ + RANGE_CHECK(cfg, g_h, 1, 16383); /* 14 bits available */ RANGE_CHECK(cfg, g_timebase.den, 1, 1000000000); RANGE_CHECK(cfg, g_timebase.num, 1, cfg->g_timebase.den); RANGE_CHECK_HI(cfg, g_profile, 3); @@ -197,8 +197,6 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, #if !(CONFIG_REALTIME_ONLY) if (cfg->g_pass == VPX_RC_LAST_PASS) { - int mb_r = (cfg->g_h + 15) / 16; - int mb_c = (cfg->g_w + 15) / 16; size_t packet_sz = sizeof(FIRSTPASS_STATS); int n_packets = cfg->rc_twopass_stats_in.sz / packet_sz; FIRSTPASS_STATS *stats; -- 2.7.4