commit 3ee6db6c8110680c051fe7a4dca97bb27474ca00
author Jingning Han <jingning@google.com> Wed Aug 05 19:00:31 2015 -0700
committer Jingning Han <jingning@google.com> Tue Aug 11 17:05:28 2015 -0700
tree e05e37dfc10ed26a4fdaee5551b13e2d85a7a1b2
parent b04dad328c33874ae1eda72c73079519935a3feb

Fork VP9 and VP10 codebase

This commit folks the VP9 and VP10 codebase and makes libvpx
support VP8, VP9, and VP10.

Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356

tools_common.c

diff --git a/tools_common.c b/tools_common.c
index 8d356af..983bd4e 100644
--- a/tools_common.c
+++ b/tools_common.c
@@ -16,11 +16,11 @@
 
 #include "./tools_common.h"
 
-#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER
+#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER
 #include "vpx/vp8cx.h"
 #endif
 
-#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER
+#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER || CONFIG_VP10_DECODER
 #include "vpx/vp8dx.h"
 #endif
 
@@ -138,6 +138,10 @@
 #if CONFIG_VP9_ENCODER
   {"vp9", VP9_FOURCC, &vpx_codec_vp9_cx},
 #endif
+
+#if CONFIG_VP10_ENCODER
+  {"vp10", VP10_FOURCC, &vpx_codec_vp10_cx},
+#endif
 };
 
 int get_vpx_encoder_count(void) {
@@ -168,6 +172,10 @@
 #if CONFIG_VP9_DECODER
   {"vp9", VP9_FOURCC, &vpx_codec_vp9_dx},
 #endif
+
+#if CONFIG_VP10_DECODER
+  {"vp10", VP10_FOURCC, &vpx_codec_vp10_dx},
+#endif
 };
 
 int get_vpx_decoder_count(void) {