Identifiers starting with underscores are reserved.

Originally committed as revision 10179 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/cmdutils.h b/cmdutils.h
index bbc77e2..e44b6b5 100644 (file)
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _CMD_UTILS_H
-#define _CMD_UTILS_H
+#ifndef CMD_UTILS_H
+#define CMD_UTILS_H
 
 typedef struct {
     const char *name;
@@ -70,4 +70,4 @@ void print_error(const char *filename, int err);
  */
 void show_license(void);
 
-#endif /* _CMD_UTILS_H */
+#endif /* CMD_UTILS_H */

diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h
index 218240b..ff5fc68 100644 (file)
--- a/libavcodec/ppc/dsputil_altivec.h
+++ b/libavcodec/ppc/dsputil_altivec.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _DSPUTIL_ALTIVEC_
-#define _DSPUTIL_ALTIVEC_
+#ifndef DSPUTIL_ALTIVEC_H
+#define DSPUTIL_ALTIVEC_H
 
 #include "dsputil_ppc.h"
 
@@ -114,4 +114,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src)
 
 #endif /* HAVE_ALTIVEC */
 
-#endif /* _DSPUTIL_ALTIVEC_ */
+#endif /* DSPUTIL_ALTIVEC_H */

diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h
index 567dfd1..803fe28 100644 (file)
--- a/libavcodec/ppc/dsputil_ppc.h
+++ b/libavcodec/ppc/dsputil_ppc.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _DSPUTIL_PPC_
-#define _DSPUTIL_PPC_
+#ifndef DSPUTIL_PPC_H
+#define DSPUTIL_PPC_H
 
 #ifdef CONFIG_POWERPC_PERF
 void powerpc_display_perf_report(void);
@@ -152,4 +152,4 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][
 #define POWERPC_PERF_STOP_COUNT(a, cond)     do {} while (0)
 #endif /* CONFIG_POWERPC_PERF */
 
-#endif /*  _DSPUTIL_PPC_ */
+#endif /*  DSPUTIL_PPC_H */

diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h
index 5a4a551..b91e3a6 100644 (file)
--- a/libavcodec/ppc/gcc_fixes.h
+++ b/libavcodec/ppc/gcc_fixes.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _GCC_FIXES_
-#define _GCC_FIXES_
+#ifndef GCC_FIXES_H
+#define GCC_FIXES_H
 
 #ifdef HAVE_ALTIVEC_H
 #include <altivec.h>
@@ -116,4 +116,4 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \
 #define const_vector vector
 #endif
 
-#endif /* _GCC_FIXES_ */
+#endif /* GCC_FIXES_H */

diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h
index 5f94650..67671e5 100644 (file)
--- a/libavformat/dv1394.h
+++ b/libavformat/dv1394.h
@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _DV_1394_H
-#define _DV_1394_H
+#ifndef DV_1394_H
+#define DV_1394_H
 
 #define DV1394_DEFAULT_CHANNEL 63
 #define DV1394_DEFAULT_CARD    0
@@ -353,4 +353,4 @@ struct dv1394_status {
 };
 
 
-#endif /* _DV_1394_H */
+#endif /* DV_1394_H */