aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Kabelac <kabi@informatics.muni.cz>2003-01-28 20:20:38 +0000
committerZdenek Kabelac <kabi@informatics.muni.cz>2003-01-28 20:20:38 +0000
commit02d697aa5f1afb7d74fee87183d56b9c8764da7c (patch)
treed58007a1e3bc002a481e08a3c26d1a7ef4483c4b
parenta8721c0930361f66f79fd35eb673fc45ae5b1b07 (diff)
downloadffmpeg-02d697aa5f1afb7d74fee87183d56b9c8764da7c.tar.gz
* headers valid for C++ compilers
Originally committed as revision 1521 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/avcodec.h8
-rw-r--r--libavformat/avformat.h8
2 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e2252f4c99..6ee2b84cdf 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1,6 +1,10 @@
#ifndef AVCODEC_H
#define AVCODEC_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "common.h"
#define LIBAVCODEC_VERSION_INT 0x000406
@@ -1245,4 +1249,8 @@ void av_free_static(void);
void *__av_mallocz_static(void** location, unsigned int size);
#define av_mallocz_static(p, s) __av_mallocz_static((void **)(p), s)
+#ifdef __cplusplus
+}
+#endif
+
#endif /* AVCODEC_H */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 9b00eba471..504eb2bf60 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1,6 +1,10 @@
#ifndef AVFORMAT_H
#define AVFORMAT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define LIBAVFORMAT_VERSION_INT 0x000406
#define LIBAVFORMAT_VERSION "0.4.6"
#define LIBAVFORMAT_BUILD 4603
@@ -403,4 +407,8 @@ int match_ext(const char *filename, const char *extensions);
#endif /* HAVE_AV_CONFIG_H */
+#ifdef __cplusplus
+}
+#endif
+
#endif /* AVFORMAT_H */