ref: 7cc3e703940b5c659795dcb0d099d7dfbbcfe75e
parent: 9f4f98fdbd17c6e88bb9d3478b8e89a27a14ac84
parent: 7999c07697740387a48783de1902a1f465dabeb0
author: James Zern <jzern@google.com>
date: Mon Mar 23 13:19:52 EDT 2015
Merge "vp8cx.h: vpx/vpx_encoder.h -> ./vpx_encoder.h"
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -16,7 +16,7 @@
* @{*/
#include "./vp8.h"
-#include "vpx/vpx_encoder.h"
+#include "./vpx_encoder.h"
/*!\file
* \brief Provides definitions for using VP8 or VP9 encoder algorithm within the