From ab3d8e6fc569ff7bc94080c4ce2d7ded13f4f234 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Fri, 11 Apr 2014 14:50:11 -0700
Subject: [PATCH] Renaming VP9D_CONFIG to VP9DecoderConfig.

Change-Id: I9677aab1c7bb0ca9e989cb21348a3a2c926d8f5a
---
 vp9/decoder/vp9_decoder.c | 2 +-
 vp9/decoder/vp9_decoder.h | 8 ++++----
 vp9/vp9_dx_iface.c        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c
index 56dbc99..faf710c 100644
--- a/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -110,7 +110,7 @@ void vp9_initialize_dec() {
   }
 }
 
-VP9Decoder *vp9_decoder_create(const VP9D_CONFIG *oxcf) {
+VP9Decoder *vp9_decoder_create(const VP9DecoderConfig *oxcf) {
   VP9Decoder *const pbi = vpx_memalign(32, sizeof(*pbi));
   VP9_COMMON *const cm = pbi ? &pbi->common : NULL;
 
diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h
index b8250c2..800f5d3 100644
--- a/vp9/decoder/vp9_decoder.h
+++ b/vp9/decoder/vp9_decoder.h
@@ -27,20 +27,20 @@
 extern "C" {
 #endif
 
-typedef struct {
+typedef struct VP9DecoderConfig {
   int width;
   int height;
   int version;
   int max_threads;
   int inv_tile_order;
-} VP9D_CONFIG;
+} VP9DecoderConfig;
 
 typedef struct VP9Decoder {
   DECLARE_ALIGNED(16, MACROBLOCKD, mb);
 
   DECLARE_ALIGNED(16, VP9_COMMON, common);
 
-  VP9D_CONFIG oxcf;
+  VP9DecoderConfig oxcf;
 
   int64_t last_time_stamp;
   int ready_for_new_data;
@@ -81,7 +81,7 @@ int vp9_get_reference_dec(struct VP9Decoder *pbi,
                           int index, YV12_BUFFER_CONFIG **fb);
 
 
-struct VP9Decoder *vp9_decoder_create(const VP9D_CONFIG *oxcf);
+struct VP9Decoder *vp9_decoder_create(const VP9DecoderConfig *oxcf);
 
 void vp9_decoder_remove(struct VP9Decoder *pbi);
 
diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c
index 5ed7484..1cd3b03 100644
--- a/vp9/vp9_dx_iface.c
+++ b/vp9/vp9_dx_iface.c
@@ -227,7 +227,7 @@ static void set_ppflags(const vpx_codec_alg_priv_t *ctx,
 }
 
 static void init_decoder(vpx_codec_alg_priv_t *ctx) {
-  VP9D_CONFIG oxcf;
+  VP9DecoderConfig oxcf;
   oxcf.width = ctx->si.w;
   oxcf.height = ctx->si.h;
   oxcf.version = 9;
-- 
2.7.4