ref: 3df4d9f62da6d3999111c7dd743e00c45fc5eb16
parent: 1f919cf27de20c3da34465bb9f40c7f19d6dec33
parent: e883c7478debd80b897ac58e807aafd5dcb2c328
author: Johann <[email protected]>
date: Mon Dec 16 14:17:33 EST 2013
Merge "Include files in the same directory directly"
--- a/vpx/svc_context.h
+++ b/vpx/svc_context.h
@@ -16,8 +16,8 @@
#ifndef VPX_SVC_CONTEXT_H_
#define VPX_SVC_CONTEXT_H_
-#include "vpx/vp8cx.h"
-#include "vpx/vpx_encoder.h"
+#include "./vp8cx.h"
+#include "./vpx_encoder.h"
#ifdef __cplusplus
extern "C" {--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -15,7 +15,7 @@
*
* @{*/
-#include "vp8.h"
+#include "./vp8.h"
/*!\file
* \brief Provides definitions for using the VP8 encoder algorithm within the
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -9,8 +9,6 @@
*/
-#include "vp8.h"
-
/*!\defgroup vp8_decoder WebM VP8 Decoder
* \ingroup vp8
*
@@ -27,6 +25,9 @@
extern "C" {#endif
+/* Include controls common to both the encoder and decoder */
+#include "./vp8.h"
+
/*!\name Algorithm interface for VP8
*
* This interface provides the capability to decode raw VP8 streams, as would
@@ -40,9 +41,6 @@
extern vpx_codec_iface_t vpx_codec_vp9_dx_algo;
extern vpx_codec_iface_t *vpx_codec_vp9_dx(void);
/*!@} - end algorithm interface member group*/
-
-/* Include controls common to both the encoder and decoder */
-#include "vp8.h"
/*!\enum vp8_dec_control_id
--- a/vpx/vpx_codec.h
+++ b/vpx/vpx_codec.h
@@ -43,8 +43,8 @@
extern "C" {#endif
-#include "vpx_integer.h"
-#include "vpx_image.h"
+#include "./vpx_integer.h"
+#include "./vpx_image.h"
/*!\brief Decorator indicating a function is deprecated */
#ifndef DEPRECATED
--- a/vpx/vpx_decoder.h
+++ b/vpx/vpx_decoder.h
@@ -29,8 +29,8 @@
extern "C" {#endif
-#include "vpx_codec.h"
-#include "vpx_external_frame_buffer.h"
+#include "./vpx_codec.h"
+#include "./vpx_external_frame_buffer.h"
/*!\brief Current ABI version number
*
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -29,7 +29,7 @@
extern "C" {#endif
-#include "vpx_codec.h"
+#include "./vpx_codec.h"
/*! Temporal Scalability: Maximum length of the sequence defining frame
* layer membership
--- a/vpx/vpx_external_frame_buffer.h
+++ b/vpx/vpx_external_frame_buffer.h
@@ -15,7 +15,7 @@
extern "C" {#endif
-#include "vpx/vpx_integer.h"
+#include "./vpx_integer.h"
/*!\brief External frame buffer
*