Commit d26295e9 authored by diego's avatar diego

Remove extern C declarations for C++.

FFmpeg is pure C and not all public headers have the declarations.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9037 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 67faa0da
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#include "avutil.h" #include "avutil.h"
#include <sys/types.h> /* size_t */ #include <sys/types.h> /* size_t */
...@@ -3152,8 +3148,4 @@ extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v); ...@@ -3152,8 +3148,4 @@ extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
#define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */ #define AVERROR_NOTSUPP AVERROR(ENOSYS) /**< Operation not supported. */
#define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */ #define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */
#ifdef __cplusplus
}
#endif
#endif /* AVCODEC_H */ #endif /* AVCODEC_H */
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
#ifndef AVFORMAT_H #ifndef AVFORMAT_H
#define AVFORMAT_H #define AVFORMAT_H
#ifdef __cplusplus
extern "C" {
#endif
#define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1) #define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1)
#define LIBAVFORMAT_VERSION 51.12.1 #define LIBAVFORMAT_VERSION 51.12.1
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT #define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
...@@ -889,9 +885,5 @@ int match_ext(const char *filename, const char *extensions); ...@@ -889,9 +885,5 @@ int match_ext(const char *filename, const char *extensions);
#endif /* HAVE_AV_CONFIG_H */ #endif /* HAVE_AV_CONFIG_H */
#ifdef __cplusplus
}
#endif
#endif /* AVFORMAT_H */ #endif /* AVFORMAT_H */
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s #define AV_TOSTRING(s) #s
...@@ -130,8 +126,4 @@ enum PixelFormat { ...@@ -130,8 +126,4 @@ enum PixelFormat {
#define PIX_FMT_YUV422 PIX_FMT_YUYV422 #define PIX_FMT_YUV422 PIX_FMT_YUYV422
#endif #endif
#ifdef __cplusplus
}
#endif
#endif /* AVUTIL_H */ #endif /* AVUTIL_H */
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
* external api for the pp stuff * external api for the pp stuff
*/ */
#ifdef __cplusplus
extern "C" {
#endif
#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0) #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0)
#define LIBPOSTPROC_VERSION 51.1.0 #define LIBPOSTPROC_VERSION 51.1.0
#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT #define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
...@@ -77,8 +73,4 @@ void pp_free_context(pp_context_t *ppContext); ...@@ -77,8 +73,4 @@ void pp_free_context(pp_context_t *ppContext);
#define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale #define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale
#ifdef __cplusplus
}
#endif
#endif #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