From: Johann Date: Mon, 16 Dec 2013 21:15:26 +0000 (-0800) Subject: Include files in the same directory directly X-Git-Tag: v1.4.0~2819^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e883c7478debd80b897ac58e807aafd5dcb2c328;p=platform%2Fupstream%2Flibvpx.git Include files in the same directory directly Change-Id: I56706a8326d9356a6735d13eb5e0832d04221c91 --- diff --git a/vpx/svc_context.h b/vpx/svc_context.h index 8204f9c..6c2367c 100644 --- 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" { diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index c0424f1..561496e 100644 --- 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 diff --git a/vpx/vp8dx.h b/vpx/vp8dx.h index 218f0b8..a677f9e 100644 --- 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 @@ -41,9 +42,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 * \brief VP8 decoder control functions diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h index 3ea36d6..2c4a2a0 100644 --- 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 diff --git a/vpx/vpx_decoder.h b/vpx/vpx_decoder.h index 08f7f43..b97382e 100644 --- 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 * diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h index 56752cf..4070694 100644 --- 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 diff --git a/vpx/vpx_external_frame_buffer.h b/vpx/vpx_external_frame_buffer.h index adf1330..0b787b8 100644 --- 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 *