From a90255c366746d32c8485d7db7a5964d1e7bd8be Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Fri, 10 Oct 2014 11:31:58 -0700
Subject: Revert "Add adaptation option for VBR."

This reverts commit 869d4ca51957614dcf5093ebb9e322cc8a8405ca.

This breaks the build via conflict with
e18edd5eb651f9b7563cbd829744807402bfe0d8.

Change-Id: If544b99e367a449452834eb8cce600f58c34ec0d
---
 vp9/encoder/vp9_firstpass.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'vp9/encoder/vp9_firstpass.h')

diff --git a/vp9/encoder/vp9_firstpass.h b/vp9/encoder/vp9_firstpass.h
index 6cc5a5f73..458cd9b90 100644
--- a/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@ -39,8 +39,6 @@ typedef struct {
 } FIRSTPASS_MB_STATS;
 #endif
 
-#define VLOW_MOTION_THRESHOLD 950
-
 typedef struct {
   double frame;
   double intra_error;
@@ -112,8 +110,6 @@ typedef struct {
   int kf_zeromotion_pct;
   int last_kfgroup_zeromotion_pct;
   int active_worst_quality;
-  int extend_minq;
-  int extend_maxq;
 
   GF_GROUP gf_group;
 } TWO_PASS;
-- 
cgit v1.2.3