Globally rename the header inclusion guard names.

Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

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

7 files changed, 21 insertions, 21 deletions

diff --git a/libavcodec/i386/dsputil_mmx.h b/libavcodec/i386/dsputil_mmx.h
index a4b3bfcdac..f095975128 100644
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/i386/dsputil_mmx.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DSPUTIL_MMX_H
-#define FFMPEG_DSPUTIL_MMX_H
+#ifndef AVCODEC_I386_DSPUTIL_MMX_H
+#define AVCODEC_I386_DSPUTIL_MMX_H
 
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
@@ -133,4 +133,4 @@ extern const double ff_pd_2[2];
 
 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
 
-#endif /* FFMPEG_DSPUTIL_MMX_H */
+#endif /* AVCODEC_I386_DSPUTIL_MMX_H */
diff --git a/libavcodec/i386/h264_i386.h b/libavcodec/i386/h264_i386.h
index 80468f68c9..5cd03a519b 100644
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/i386/h264_i386.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_H264_I386_H
-#define FFMPEG_H264_I386_H
+#ifndef AVCODEC_I386_H264_I386_H
+#define AVCODEC_I386_H264_I386_H
 
 #include "libavcodec/cabac.h"
 
@@ -152,4 +152,4 @@ static int decode_significance_8x8_x86(CABACContext *c,
 #endif /* defined(ARCH_X86) && defined(HAVE_7REGS) &&                 */
        /* defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
 
-#endif /* FFMPEG_H264_I386_H */
+#endif /* AVCODEC_I386_H264_I386_H */
diff --git a/libavcodec/i386/idct_xvid.h b/libavcodec/i386/idct_xvid.h
index 8e62671e5e..2051ebd591 100644
--- a/libavcodec/i386/idct_xvid.h
+++ b/libavcodec/i386/idct_xvid.h
@@ -23,8 +23,8 @@
  * header for Xvid IDCT functions
  */
 
-#ifndef FFMPEG_IDCT_XVID_H
-#define FFMPEG_IDCT_XVID_H
+#ifndef AVCODEC_I386_IDCT_XVID_H
+#define AVCODEC_I386_IDCT_XVID_H
 
 void ff_idct_xvid_mmx(short *block);
 void ff_idct_xvid_mmx2(short *block);
@@ -32,4 +32,4 @@ void ff_idct_xvid_sse2(short *block);
 void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block);
 void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block);
 
-#endif /* FFMPEG_IDCT_XVID_H */
+#endif /* AVCODEC_I386_IDCT_XVID_H */
diff --git a/libavcodec/i386/mathops.h b/libavcodec/i386/mathops.h
index 75ed55c57d..46c2d638f0 100644
--- a/libavcodec/i386/mathops.h
+++ b/libavcodec/i386/mathops.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_I386_MATHOPS_H
-#define FFMPEG_I386_MATHOPS_H
+#ifndef AVCODEC_I386_MATHOPS_H
+#define AVCODEC_I386_MATHOPS_H
 
 #ifdef FRAC_BITS
 #   define MULL(ra, rb) \
@@ -42,4 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\
      rt; })
 
-#endif /* FFMPEG_I386_MATHOPS_H */
+#endif /* AVCODEC_I386_MATHOPS_H */
diff --git a/libavcodec/i386/mmx.h b/libavcodec/i386/mmx.h
index 361c6b6371..197e059a1c 100644
--- a/libavcodec/i386/mmx.h
+++ b/libavcodec/i386/mmx.h
@@ -18,8 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_MMX_H
-#define FFMPEG_MMX_H
+#ifndef AVCODEC_I386_MMX_H
+#define AVCODEC_I386_MMX_H
 
 #warning Everything in this header is deprecated, use plain asm()! New code using this header will be rejected.
 
@@ -282,4 +282,4 @@ typedef        union {
 #define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)
 
 
-#endif /* FFMPEG_MMX_H */
+#endif /* AVCODEC_I386_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_mmx.h b/libavcodec/i386/vp3dsp_mmx.h
index d0e61960ae..2c6fc4fa59 100644
--- a/libavcodec/i386/vp3dsp_mmx.h
+++ b/libavcodec/i386/vp3dsp_mmx.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_VP3DSP_MMX_H
-#define FFMPEG_VP3DSP_MMX_H
+#ifndef AVCODEC_I386_VP3DSP_MMX_H
+#define AVCODEC_I386_VP3DSP_MMX_H
 
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
@@ -29,4 +29,4 @@ void ff_vp3_idct_mmx(int16_t *data);
 void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif /* FFMPEG_VP3DSP_MMX_H */
+#endif /* AVCODEC_I386_VP3DSP_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/i386/vp3dsp_sse2.h
index a421abc9ae..55908c22a0 100644
--- a/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_VP3DSP_SSE2_H
-#define FFMPEG_VP3DSP_SSE2_H
+#ifndef AVCODEC_I386_VP3DSP_SSE2_H
+#define AVCODEC_I386_VP3DSP_SSE2_H
 
 #include "libavcodec/dsputil.h"
 
@@ -28,4 +28,4 @@ void ff_vp3_idct_sse2(int16_t *input_data);
 void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif /* FFMPEG_VP3DSP_SSE2_H */
+#endif /* AVCODEC_I386_VP3DSP_SSE2_H */