commit 4b2c2b9aa4a273a23d90ddb3bbf6dfb3482e0b8f
author Ronald S. Bultje <rbultje@google.com> Thu Nov 01 11:09:58 2012 -0700
committer Ronald S. Bultje <rbultje@google.com> Thu Nov 01 16:31:22 2012 -0700
tree 20eef975f1a8c28978d826a354092433b9093588
parent 6c280c2299f078a475dc87e7615fdf1a4998cd31

Rename vp8/ codec directory to vp9/.

Change-Id: Ic084c475844b24092a433ab88138cf58af3abbe4

vpxdec.c

diff --git a/vpxdec.c b/vpxdec.c
index 04d1ac7..9f20a9a 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -22,7 +22,7 @@
 #include "vpx_config.h"
 #include "vpx/vpx_decoder.h"
 #include "vpx_ports/vpx_timer.h"
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
 #include "vpx/vp8dx.h"
 #endif
 #if CONFIG_MD5
@@ -56,8 +56,8 @@
    unsigned int             fourcc;
    unsigned int             fourcc_mask;
 } ifaces[] = {
-#if CONFIG_VP8_DECODER
-  {"vp8",  vpx_codec_vp8_dx,   VP8_FOURCC, 0x00FFFFFF},
+#if CONFIG_VP9_DECODER
+  {"vp9",  vpx_codec_vp8_dx,   VP8_FOURCC, 0x00FFFFFF},
 #endif
 };
 
@@ -104,7 +104,7 @@
   NULL
 };
 
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
 static const arg_def_t addnoise_level = ARG_DEF(NULL, "noise-level", 1,
                                                 "Enable VP8 postproc add noise");
 static const arg_def_t deblock = ARG_DEF(NULL, "deblock", 0,
@@ -135,7 +135,7 @@
   fprintf(stderr, "Usage: %s <options> filename\n\n"
           "Options:\n", exec_name);
   arg_show_usage(stderr, all_args);
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
   fprintf(stderr, "\nVP8 Postprocessing Options:\n");
   arg_show_usage(stderr, vp8_pp_args);
 #endif
@@ -684,7 +684,7 @@
   unsigned int            fps_num;
   void                   *out = NULL;
   vpx_codec_dec_cfg_t     cfg = {0};
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
   vp8_postproc_cfg_t      vp8_pp_cfg = {0};
   int                     vp8_dbg_color_ref_frame = 0;
   int                     vp8_dbg_color_mb_modes = 0;
@@ -744,7 +744,7 @@
     else if (arg_match(&arg, &verbosearg, argi))
       quiet = 0;
 
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
     else if (arg_match(&arg, &addnoise_level, argi)) {
       postproc = 1;
       vp8_pp_cfg.post_proc_flag |= VP8_ADDNOISE;
@@ -909,7 +909,7 @@
   if (!quiet)
     fprintf(stderr, "%s\n", decoder.name);
 
-#if CONFIG_VP8_DECODER
+#if CONFIG_VP9_DECODER
 
   if (vp8_pp_cfg.post_proc_flag
       && vpx_codec_control(&decoder, VP8_SET_POSTPROC, &vp8_pp_cfg)) {