[MPlayer-cvslog] r24800 - in trunk/libswscale: rgb2rgb.h swscale.h swscale_internal.h

diego subversion at mplayerhq.hu
Thu Oct 18 11:30:33 CEST 2007


Author: diego
Date: Thu Oct 18 11:30:33 2007
New Revision: 24800

Log:
Add FFMPEG_ prefix to all multiple inclusion guards.


Modified:
   trunk/libswscale/rgb2rgb.h
   trunk/libswscale/swscale.h
   trunk/libswscale/swscale_internal.h

Modified: trunk/libswscale/rgb2rgb.h
==============================================================================
--- trunk/libswscale/rgb2rgb.h	(original)
+++ trunk/libswscale/rgb2rgb.h	Thu Oct 18 11:30:33 2007
@@ -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_
 
 void sws_rgb2rgb_init(int flags);
 
-#endif
+#endif /* RGB2RGB_INCLUDED */

Modified: trunk/libswscale/swscale.h
==============================================================================
--- trunk/libswscale/swscale.h	(original)
+++ trunk/libswscale/swscale.h	Thu Oct 18 11:30:33 2007
@@ -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(
                                         int dstW, int dstH, int dstFormat, int flags,
                                         SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
 
-#endif
+#endif /* FFMPEG_SWSCALE_H */

Modified: trunk/libswscale/swscale_internal.h
==============================================================================
--- trunk/libswscale/swscale_internal.h	(original)
+++ trunk/libswscale/swscale_internal.h	Thu Oct 18 11:30:33 2007
@@ -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 */



More information about the MPlayer-cvslog mailing list