diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 6b7333f1df06abacc7097ec3a2d3edfb8182420b..34af6ea8ee21cf69de7b3eaff60ab07451f53271 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2188,11 +2188,6 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) #endif -#ifdef INTRARDOPT - cpi->intra_rd_opt = 1; - -#endif - cpi->frames_since_key = 8; // Give a sensible default for the first frame. cpi->key_frame_frequency = cpi->oxcf.key_freq; diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 0ea6a3b47aaec5b1de8c9bf254aedb99a7057d91..cb768c01840d2e4bf18876adf20b5df75e121416 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -29,7 +29,6 @@ #include "vpx/internal/vpx_codec_internal.h" #include "mcomp.h" -#define INTRARDOPT //#define SPEEDSTATS 1 #define MIN_GF_INTERVAL 4 #define DEFAULT_GF_INTERVAL 7 @@ -310,15 +309,12 @@ typedef struct int subseqblockweight; int errthresh; -#ifdef INTRARDOPT int RDMULT; int RDDIV ; TOKENEXTRA *rdtok; - int intra_rd_opt; vp8_writer rdbc; int intra_mode_costs[10]; -#endif CODING_CONTEXT coding_context;