add "memory" to the clobber list we change memory so we need it, this also fixes...

[ffmpeg] / libavcodec / swscale.h

diff --git a/libavcodec/swscale.h b/libavcodec/swscale.h
index 39ac0f1495bf39d9f008e4e34051d7577617cf1c..9dc3ca31f501c241702f17f089a7e3dd906c982a 100644 (file)
--- a/libavcodec/swscale.h
+++ b/libavcodec/swscale.h
@@ -1,5 +1,30 @@
+/*
+ * copyright (C) 2006 Luca Abeni
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
 #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,10 +54,8 @@ int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[],
 
 void sws_freeContext(struct SwsContext *swsContext);
 
-static inline void sws_global_init(void *(*alloc)(unsigned int size),
-                     void (*free)(void *ptr),
-                     void (*log)(void*, int level, const char *fmt, ...))
-{
+#ifdef __cplusplus
 }
+#endif
 
 #endif /* SWSCALE_EMU_H */