ref: 71412d82a377ca023a8c0ab77419e11342dc9c8a
parent: cd14e03196d3f01e57618c3d1c12d6ce597c8980
parent: bb55193448ab01b69d68d778e21a6606b8d80a4f
author: Jingning Han <[email protected]>
date: Fri Aug 21 20:00:27 EDT 2015
Merge "vpxenc: fix DECODER ifdef"
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -35,7 +35,7 @@
#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER
#include "vpx/vp8cx.h"
#endif
-#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER || CONFIG_VP10_ENCODER
+#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER || CONFIG_VP10_DECODER
#include "vpx/vp8dx.h"
#endif