[SCM] libav/experimental: Allow swscale emulation header to be included by C++ programs

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:50:04 UTC 2013


The following commit has been merged in the experimental branch:
commit a37e9e860682a8c171188aa975e244391f887f15
Author: Luca Abeni <lucabe72 at email.it>
Date:   Sat Aug 19 15:14:44 2006 +0000

    Allow swscale emulation header to be included by C++ programs
    
    Originally committed as revision 6027 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/swscale.h b/libavcodec/swscale.h
index 5d13f90..d23d777 100644
--- a/libavcodec/swscale.h
+++ b/libavcodec/swscale.h
@@ -1,5 +1,10 @@
 #ifndef SWSCALE_EMU_H
 #define SWSCALE_EMU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Dummy, only useful for compilation! */
 #define SWS_FAST_BILINEAR 1
 #define SWS_BILINEAR 2
@@ -29,4 +34,8 @@ int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[],
 
 void sws_freeContext(struct SwsContext *swsContext);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SWSCALE_EMU_H */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list