[SCM] libav/experimental: Add FFMPEG_ prefix to all multiple inclusion guards.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 39c70be189ce4c5a79e5a09cb03a8cc5c72616e7
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Oct 18 09:30:33 2007 +0000

    Add FFMPEG_ prefix to all multiple inclusion guards.
    
    Originally committed as revision 24800 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index c6fab2d..770734d 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RGB2RGB_INCLUDED
-#define RGB2RGB_INCLUDED
+#ifndef FFMPEG_RGB2RGB_H
+#define FFMPEG_RGB2RGB_H
 
 #include <inttypes.h>
 
@@ -143,4 +143,4 @@ extern void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint
 
 void sws_rgb2rgb_init(int flags);
 
-#endif
+#endif /* RGB2RGB_INCLUDED */
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 75e66ed..e912134 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SWSCALE_H
-#define SWSCALE_H
+#ifndef FFMPEG_SWSCALE_H
+#define FFMPEG_SWSCALE_H
 
 /**
  * @file swscale.h
@@ -138,4 +138,4 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context,
                                         int dstW, int dstH, int dstFormat, int flags,
                                         SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
 
-#endif
+#endif /* FFMPEG_SWSCALE_H */
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index b5d4ed7..2c172e7 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SWSCALE_INTERNAL_H
-#define SWSCALE_INTERNAL_H
+#ifndef FFMPEG_SWSCALE_INTERNAL_H
+#define FFMPEG_SWSCALE_INTERNAL_H
 
 #ifdef HAVE_ALTIVEC_H
 #include <altivec.h>
@@ -263,4 +263,4 @@ static inline int fmt_depth(int fmt)
     }
 }
 
-#endif
+#endif /* FFMPEG_SWSCALE_INTERNAL_H */

-- 
Libav/FFmpeg packaging