ref: ad6ed536d5084a5839a57f8c02b73a5acc010b95
parent: b03d3da9c178324eb7ced5f50ed40473d05d944a
parent: e288c6015e5920286c1321362836a68b9540f916
author: Dmitry Kovalev <dkovalev@google.com>
date: Thu Oct 3 06:44:16 EDT 2013
Merge "Removing vpx_codec_impl_{top, bottom}.h files."
--- a/libs.mk
+++ b/libs.mk
@@ -183,8 +183,6 @@
INSTALL-LIBS-yes += include/vpx/vpx_codec.h
INSTALL-LIBS-yes += include/vpx/vpx_image.h
INSTALL-LIBS-yes += include/vpx/vpx_integer.h
-INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_top.h
-INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_bottom.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder.h
INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx/vpx_encoder.h
ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
--- a/vpx/vp8.h
+++ b/vpx/vp8.h
@@ -30,8 +30,11 @@
*/
#ifndef VP8_H
#define VP8_H
-#include "vpx_codec_impl_top.h"
+#ifdef __cplusplus
+extern "C" {+#endif
+
/*!\brief Control functions
*
* The set of macros define the control functions of VP8 interface
@@ -125,5 +128,8 @@
/*! @} - end defgroup vp8 */
-#include "vpx_codec_impl_bottom.h"
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
#endif
--- a/vpx/vp8cx.h
+++ b/vpx/vp8cx.h
@@ -22,8 +22,11 @@
*/
#ifndef VP8CX_H
#define VP8CX_H
-#include "vpx_codec_impl_top.h"
+#ifdef __cplusplus
+extern "C" {+#endif
+
/*!\name Algorithm interface for VP8
*
* This interface provides the capability to encode raw VP8 streams, as would
@@ -334,5 +337,8 @@
VPX_CTRL_USE_TYPE(VP9E_SET_MAX_Q, unsigned int)
VPX_CTRL_USE_TYPE(VP9E_SET_MIN_Q, unsigned int)
/*! @} - end defgroup vp8_encoder */
-#include "vpx_codec_impl_bottom.h"
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
#endif
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -22,8 +22,11 @@
*/
#ifndef VP8DX_H
#define VP8DX_H
-#include "vpx_codec_impl_top.h"
+#ifdef __cplusplus
+extern "C" {+#endif
+
/*!\name Algorithm interface for VP8
*
* This interface provides the capability to decode raw VP8 streams, as would
@@ -100,6 +103,8 @@
/*! @} - end defgroup vp8_decoder */
+#ifdef __cplusplus
+} // extern "C"
+#endif
-#include "vpx_codec_impl_bottom.h"
#endif
--- a/vpx/vpx_codec.mk
+++ b/vpx/vpx_codec.mk
@@ -35,7 +35,5 @@
API_SRCS-yes += src/vpx_image.c
API_SRCS-yes += vpx_codec.h
API_SRCS-yes += vpx_codec.mk
-API_SRCS-yes += vpx_codec_impl_bottom.h
-API_SRCS-yes += vpx_codec_impl_top.h
API_SRCS-yes += vpx_image.h
API_SRCS-$(BUILD_LIBVPX) += vpx_integer.h
--- a/vpx/vpx_codec_impl_bottom.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/*
- * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file is to be included at the bottom of the header files defining the
- * interface to individual codecs and contains matching blocks to those defined
- * in vpx_codec_impl_top.h
- */
-#ifdef __cplusplus
-}
-#endif
--- a/vpx/vpx_codec_impl_top.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/*
- * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-
-/*
- * This file is to be included at the top of the header files defining the
- * interface to individual codecs and contains various workarounds common
- * to all codec implementations.
- */
-#ifdef __cplusplus
-extern "C" {-#endif
--
⑨