Commit 14566125 authored by John Koleszar's avatar John Koleszar Committed by Code Review
Browse files

Merge "use relative include path"

parents db6ee543 4e4f8352
......@@ -30,7 +30,7 @@
*/
#ifndef VP8_H
#define VP8_H
#include "vpx/vpx_codec_impl_top.h"
#include "vpx_codec_impl_top.h"
/*!\brief Control functions
*
......@@ -126,5 +126,5 @@ VPX_CTRL_USE_TYPE(VP8_SET_DBG_DISPLAY_MV, int)
DECLSPEC_DEPRECATED extern vpx_codec_iface_t vpx_codec_vp8_algo DEPRECATED;
#endif
#include "vpx/vpx_codec_impl_bottom.h"
#include "vpx_codec_impl_bottom.h"
#endif
......@@ -22,7 +22,7 @@
*/
#ifndef VP8CX_H
#define VP8CX_H
#include "vpx/vpx_codec_impl_top.h"
#include "vpx_codec_impl_top.h"
/*!\name Algorithm interface for VP8
*
......@@ -296,5 +296,5 @@ VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER, int *)
VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER_64, int *)
/*! @} - end defgroup vp8_encoder */
#include "vpx/vpx_codec_impl_bottom.h"
#include "vpx_codec_impl_bottom.h"
#endif
......@@ -22,7 +22,7 @@
*/
#ifndef VP8DX_H
#define VP8DX_H
#include "vpx/vpx_codec_impl_top.h"
#include "vpx_codec_impl_top.h"
/*!\name Algorithm interface for VP8
*
......@@ -74,5 +74,5 @@ VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *)
/*! @} - end defgroup vp8_decoder */
#include "vpx/vpx_codec_impl_bottom.h"
#include "vpx_codec_impl_bottom.h"
#endif
......@@ -14,7 +14,7 @@
*/
#ifndef VP8E_H
#define VP8E_H
#include "vpx/vpx_codec_impl_top.h"
#include "vpx_codec_impl_top.h"
#if defined(VPX_CODEC_DISABLE_COMPAT) && VPX_CODEC_DISABLE_COMPAT
#error "Backwards compatibility disabled: don't include vp8e.h"
......@@ -59,5 +59,5 @@ VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_FRAMETYPE, int)
* #VPX_DL_BEST_QUALITY constants to that parameter instead.
*/
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_ENCODING_MODE, vp8e_encoding_mode)
#include "vpx/vpx_codec_impl_bottom.h"
#include "vpx_codec_impl_bottom.h"
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment