From 73bbdfe506d69b50437099152de0ac855edfe258 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@google.com>
Date: Fri, 28 Oct 2011 14:36:03 -0700
Subject: [PATCH] Rename use_dc_pred to use_16x16_pred.
Because the variable doesn't distinguish between DC and non-DC
prediction, but rather between 16x16 or 4x4 prediction.
Change-ID: Ia4e7dda2bd6230c91515072e3277be2d64e42629
---
vp8/encoder/encodeintra.c | 4 ++--
vp8/encoder/encodeintra.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index 3c0456092e..3bd52c9b7e 100644
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -32,14 +32,14 @@ extern int enc_debug;
#define IF_RTCD(x) NULL
#endif
-int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred)
+int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_16x16_pred)
{
int i;
int intra_pred_var = 0;
(void) cpi;
- if (use_dc_pred)
+ if (use_16x16_pred)
{
x->e_mbd.mode_info_context->mbmi.mode = DC_PRED;
x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED;
diff --git a/vp8/encoder/encodeintra.h b/vp8/encoder/encodeintra.h
index 9c1fa56842..30f7fce168 100644
--- a/vp8/encoder/encodeintra.h
+++ b/vp8/encoder/encodeintra.h
@@ -13,7 +13,7 @@
#define _ENCODEINTRA_H_
#include "onyx_int.h"
-int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred);
+int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_16x16_pred);
void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *, MACROBLOCK *x);
void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb);
--
GitLab