--- libavutil/avutil.h	2007/05/16 10:50:18	9036
+++ libavutil/avutil.h	2007/05/16 12:25:54	9037
@@ -27,6 +27,10 @@
  */
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
@@ -126,4 +130,8 @@
 #define PIX_FMT_YUV422  PIX_FMT_YUYV422
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* AVUTIL_H */
--- libpostproc/postprocess.h	2007/05/16 10:50:18	9036
+++ libpostproc/postprocess.h	2007/05/16 12:25:54	9037
@@ -27,6 +27,10 @@
  *     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
@@ -73,4 +77,8 @@
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
--- libswscale/swscale.h.orig	2007-07-10 23:48:58.000000000 +0200
+++ libswscale/swscale.h	2007-07-10 23:49:46.000000000 +0200
@@ -27,6 +27,10 @@
  *     external api for the swscale stuff
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "avutil.h"
 
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
@@ -138,4 +142,8 @@
                                         int dstW, int dstH, int dstFormat, int flags,
                                         SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
--- libavcodec/avcodec.h.orig	2007-07-10 23:57:24.000000000 +0200
+++ libavcodec/avcodec.h	2007-07-10 23:57:29.000000000 +0200
@@ -27,6 +27,10 @@
  */
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "avutil.h"
 #include <sys/types.h> /* size_t */
 
@@ -2937,4 +2941,8 @@
 #define AVERROR_NOTSUPP     AVERROR(ENOSYS)  /**< Operation not supported. */
 #define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* AVCODEC_H */
--- libavformat/avformat.h.orig	2007-07-10 23:57:24.000000000 +0200
+++ libavformat/avformat.h	2007-07-10 23:57:29.000000000 +0200
@@ -21,6 +21,10 @@
 #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
@@ -874,5 +878,9 @@
 
 #endif /* HAVE_AV_CONFIG_H */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* AVFORMAT_H */