From d26295e9c10edde1c4b627dca0ff6dc60a2a589d Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 May 2007 12:25:54 +0000 Subject: [PATCH] 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 --- libavcodec/avcodec.h | 8 -------- libavformat/avformat.h | 8 -------- libavutil/avutil.h | 8 -------- libpostproc/postprocess.h | 8 -------- 4 files changed, 32 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 844945cb7..95b26a7a3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -27,10 +27,6 @@ */ -#ifdef __cplusplus -extern "C" { -#endif - #include "avutil.h" #include /* size_t */ @@ -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_NOENT AVERROR(ENOENT) /**< No such file or directory. */ -#ifdef __cplusplus -} -#endif - #endif /* AVCODEC_H */ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1e8028cdc..d63966662 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -21,10 +21,6 @@ #ifndef AVFORMAT_H #define AVFORMAT_H -#ifdef __cplusplus -extern "C" { -#endif - #define LIBAVFORMAT_VERSION_INT ((51<<16)+(12<<8)+1) #define LIBAVFORMAT_VERSION 51.12.1 #define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT @@ -889,9 +885,5 @@ int match_ext(const char *filename, const char *extensions); #endif /* HAVE_AV_CONFIG_H */ -#ifdef __cplusplus -} -#endif - #endif /* AVFORMAT_H */ diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 32bc40bfb..e010ed356 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -27,10 +27,6 @@ */ -#ifdef __cplusplus -extern "C" { -#endif - #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s @@ -130,8 +126,4 @@ enum PixelFormat { #define PIX_FMT_YUV422 PIX_FMT_YUYV422 #endif -#ifdef __cplusplus -} -#endif - #endif /* AVUTIL_H */ diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index eed92ba6d..a240558f7 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -27,10 +27,6 @@ * external api for the pp stuff */ -#ifdef __cplusplus -extern "C" { -#endif - #define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0) #define LIBPOSTPROC_VERSION 51.1.0 #define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT @@ -77,8 +73,4 @@ void pp_free_context(pp_context_t *ppContext); #define PP_PICT_TYPE_QP2 0x00000010 ///< MPEG2 style QScale -#ifdef __cplusplus -} -#endif - #endif -- 2.39.2