Mercurial > libavcodec.hg

changeset 5163:9ecbfc0c82bf libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add multiple inclusion guards to headers
author mru
date Sun, 17 Jun 2007 00:01:30 +0000
parents 4394344397d8
children 830b9dd36fef
files armv4l/mathops.h atrac3data.h bethsoftvideo.h bmp.h cavsdata.h cookdata.h dca.h dcadata.h dcahuff.h dnxhddata.h dvdata.h elbg.h faandct.h golomb.h h261.h h261data.h h263_parser.h h263data.h h264data.h i386/mathops.h imcdata.h indeo2data.h indeo3data.h mpcdata.h mpeg12data.h mpeg4data.h mpegaudiodectab.h mpegaudiotab.h msmpeg4tab.h ppc/mathops.h ppc/types_altivec.h rangecoder.h roqvideo.h simple_idct.h sparc/vis.h svq1_cb.h ulti_cb.h vc1.h vc1acdata.h vorbis_enc_data.h wmadata.h xiph.h xvmc_render.h
diffstat 43 files changed, 210 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/armv4l/mathops.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/armv4l/mathops.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_ARM_MATHOPS_H
+#define AVCODEC_ARM_MATHOPS_H
+
 #ifdef FRAC_BITS
 #   define MULL(a, b) \
         ({  int lo, hi;\
@@ -47,3 +50,5 @@
          __rt; })
 
 #endif
+
+#endif
--- a/atrac3data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/atrac3data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -25,6 +25,9 @@
  * Atrac 3 AKA RealAudio 8 compatible decoder data
  */
 
+#ifndef AVCODEC_ATRAC3DATA_H
+#define AVCODEC_ATRAC3DATA_H
+
 #include <stdint.h>
 
 /* VLC tables */
@@ -133,3 +136,5 @@
 
 /* joint stereo related tables */
 static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0};
+
+#endif
--- a/bethsoftvideo.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/bethsoftvideo.h	Sun Jun 17 00:01:30 2007 +0000
@@ -1,3 +1,6 @@
+#ifndef AVCODEC_BETHSOFTVIDEO_H
+#define AVCODEC_BETHSOFTVIDEO_H
+
 enum BethsoftVidBlockType
 {
     PALETTE_BLOCK       = 0x02,
@@ -8,3 +11,5 @@
     VIDEO_YOFF_P_FRAME  = 0x04,
     EOF_BLOCK           = 0x14,
 };
+
+#endif
--- a/bmp.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/bmp.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_BMP_H
+#define AVCODEC_BMP_H
+
 #include "avcodec.h"
 
 typedef struct BMPContext {
@@ -31,3 +34,5 @@
     BMP_RLE4        =2,
     BMP_BITFIELDS   =3,
 } BiCompression;
+
+#endif
--- a/cavsdata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/cavsdata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef AVCODEC_CAVSDATA_H
+#define AVCODEC_CAVSDATA_H
+
 #include "cavs.h"
 
 static const uint8_t partition_flags[30] = {
@@ -514,3 +517,5 @@
 static const int_fast8_t top_modifier_l[8]  = {-1, 1, 5,-1,-1, 5, 7, 7};
 static const int_fast8_t left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
 static const int_fast8_t top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};
+
+#endif
--- a/cookdata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/cookdata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -26,6 +26,9 @@
  * Cook AKA RealAudio G2 compatible decoderdata
  */
 
+#ifndef AVCODEC_COOKDATA_H
+#define AVCODEC_COOKDATA_H
+
 #include <stdint.h>
 
 /* various data tables */
@@ -559,3 +562,5 @@
 static const float* cplscales[5] = {
     cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
 };
+
+#endif
--- a/dca.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/dca.h	Sun Jun 17 00:01:30 2007 +0000
@@ -22,8 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DCA_H
+#define AVCODEC_DCA_H
+
 /** DCA syncwords, also used for bitstream type detection */
 #define DCA_MARKER_RAW_BE 0x7FFE8001
 #define DCA_MARKER_RAW_LE 0xFE7F0180
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8
+
+#endif
--- a/dcadata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/dcadata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -24,6 +24,9 @@
  * @file dcadata.c
  */
 
+#ifndef AVCODEC_DCADATA_H
+#define AVCODEC_DCADATA_H
+
 #include <stdint.h>
 
 /* Generic tables */
@@ -8467,3 +8470,5 @@
 
 
 */
+
+#endif
--- a/dcahuff.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/dcahuff.h	Sun Jun 17 00:01:30 2007 +0000
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DCAHUFF_H
+#define AVCODEC_DCAHUFF_H
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -1069,3 +1072,5 @@
   { bitalloc_129_bits_a, bitalloc_129_bits_b, bitalloc_129_bits_c, bitalloc_129_bits_d,
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
+
+#endif
--- a/dnxhddata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/dnxhddata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DNXHDDATA_H
+#define AVCODEC_DNXHDDATA_H
+
 #include <stdint.h>
 
 static const uint8_t dnxhd_1238_luma_weigth[] = {
@@ -106,3 +109,5 @@
 static const uint8_t dnxhd_1238_run[62] = {
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
 };
+
+#endif
--- a/dvdata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/dvdata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -24,6 +24,9 @@
  * Constants for DV codec.
  */
 
+#ifndef AVCODEC_DVDATA_H
+#define AVCODEC_DVDATA_H
+
 #include "avcodec.h"
 #include "rational.h"
 
@@ -2725,3 +2728,5 @@
     buf[2] = 0xff;             /* reserved -- always 1 */
     return 3;
 }
+
+#endif
--- a/elbg.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/elbg.h	Sun Jun 17 00:01:30 2007 +0000
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_ELBG_H
+#define AVCODEC_ELBG_H
+
 #include "random.h"
 
 /**
@@ -48,3 +51,5 @@
 void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int num_steps, int *closest_cb,
                   AVRandomState *rand_state);
+
+#endif
--- a/faandct.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/faandct.h	Sun Jun 17 00:01:30 2007 +0000
@@ -27,9 +27,14 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
+#ifndef AVCODEC_FAANDCT_H
+#define AVCODEC_FAANDCT_H
+
 #include "dsputil.h"
 
 #define FAAN_POSTSCALE
 
 void ff_faandct(DCTELEM * data);
 void ff_faandct248(DCTELEM * data);
+
+#endif
--- a/golomb.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/golomb.h	Sun Jun 17 00:01:30 2007 +0000
@@ -28,6 +28,9 @@
  * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
  */
 
+#ifndef AVCODEC_GOLOMB_H
+#define AVCODEC_GOLOMB_H
+
 #include <stdint.h>
 #include "bitstream.h"
 
@@ -480,3 +483,5 @@
 
     set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
 }
+
+#endif
--- a/h261.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/h261.h	Sun Jun 17 00:01:30 2007 +0000
@@ -25,6 +25,9 @@
  * h261codec.
  */
 
+#ifndef AVCODEC_H261_H
+#define AVCODEC_H261_H
+
 #include "mpegvideo.h"
 
 /**
@@ -44,3 +47,5 @@
 }H261Context;
 
 #define MB_TYPE_H261_FIL 0x800000
+
+#endif
--- a/h261data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/h261data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -24,6 +24,9 @@
  * H.261 tables.
  */
 
+#ifndef AVCODEC_H261DATA_H
+#define AVCODEC_H261DATA_H
+
 #include <stdint.h>
 #include "h261.h"
 
@@ -157,3 +160,5 @@
     h261_tcoeff_run,
     h261_tcoeff_level,
 };
+
+#endif
--- a/h263_parser.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/h263_parser.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_H263_PARSER_H
+#define AVCODEC_H263_PARSER_H
+
 #include "parser.h"
 
 int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
+
+#endif
--- a/h263data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/h263data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -26,6 +26,9 @@
  * H.263 tables.
  */
 
+#ifndef AVCODEC_H263DATA_H
+#define AVCODEC_H263DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 
@@ -308,3 +311,4 @@
     0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
 };
 
+#endif
--- a/h264data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/h264data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -27,6 +27,9 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
+#ifndef AVCODEC_H264DATA_H
+#define AVCODEC_H264DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 #include "rational.h"
@@ -1325,3 +1328,5 @@
         {  31,  12 }, {  37,  23 }, {  31,  38 }, {  20,  64 },
     }
 };
+
+#endif
--- a/i386/mathops.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/i386/mathops.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_X86_MATHOPS_H
+#define AVCODEC_X86_MATHOPS_H
+
 #ifdef FRAC_BITS
 #   define MULL(ra, rb) \
         ({ int rt, dummy; asm (\
@@ -39,3 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\
      rt; })
 
+#endif
--- a/imcdata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/imcdata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef AVCODEC_IMCDATA_H
+#define AVCODEC_IMCDATA_H
+
 #include <stdint.h>
 
 static const uint16_t band_tab[33] = {
@@ -164,3 +167,4 @@
     }
 };
 
+#endif
--- a/indeo2data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/indeo2data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_INDEO2DATA_H
+#define AVCODEC_INDEO2DATA_H
+
 #include <stdint.h>
 
 #define IR2_CODES 143
@@ -134,3 +137,5 @@
  0x28, 0x5C, 0x6C, 0xC1, 0x94, 0x3F, 0xC1, 0x6C,
  0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
 };
+
+#endif
--- a/indeo3data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/indeo3data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_INDEO3DATA_H
+#define AVCODEC_INDEO3DATA_H
+
 #include <stdint.h>
 
 static const uint32_t correction[] = {
@@ -2335,3 +2338,5 @@
         0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
+
+#endif
--- a/mpcdata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/mpcdata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef AVCODEC_MPCDATA_H
+#define AVCODEC_MPCDATA_H
+
 #include <stdint.h>
 
 static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
@@ -206,3 +209,5 @@
     0.000000092001613439, 0.000000076635565449, 0.000000063835940978, 0.000000053174105119,
     0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
 };
+
+#endif
--- a/mpeg12data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/mpeg12data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -25,6 +25,9 @@
  * MPEG1/2 tables.
  */
 
+#ifndef AVCODEC_MPEG12DATA_H
+#define AVCODEC_MPEG12DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 
@@ -475,3 +478,5 @@
     0xff, 0xff, 0xff,
     0xff, 0xff, 0xff,
 };
+
+#endif
--- a/mpeg4data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/mpeg4data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -25,6 +25,9 @@
  * mpeg4 tables.
  */
 
+#ifndef AVCODEC_MPEG4DATA_H
+#define AVCODEC_MPEG4DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 
@@ -425,3 +428,5 @@
 static const uint8_t mpeg4_dc_threshold[8]={
     99, 13, 15, 17, 19, 21, 23, 0
 };
+
+#endif
--- a/mpegaudiodectab.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/mpegaudiodectab.h	Sun Jun 17 00:01:30 2007 +0000
@@ -24,6 +24,9 @@
  * mpeg audio layer decoder tables.
  */
 
+#ifndef AVCODEC_MPEGAUDIODECTAB_H
+#define AVCODEC_MPEGAUDIODECTAB_H
+
 #include <stdint.h>
 #include "mpegaudio.h"
 
@@ -599,3 +602,5 @@
 static const float ci_table[8] = {
     -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037,
 };
+
+#endif
--- a/mpegaudiotab.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/mpegaudiotab.h	Sun Jun 17 00:01:30 2007 +0000
@@ -27,6 +27,9 @@
  * Most of them come from the mpeg audio specification.
  */
 
+#ifndef AVCODEC_MPEGAUDIOTAB_H
+#define AVCODEC_MPEGAUDIOTAB_H
+
 #include <stdint.h>
 #include "mpegaudio.h"
 
@@ -112,3 +115,4 @@
 
 static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 };
 
+#endif
--- a/msmpeg4tab.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/msmpeg4tab.h	Sun Jun 17 00:01:30 2007 +0000
@@ -27,6 +27,9 @@
  * MSMPEG4 data tables.
  */
 
+#ifndef AVCODEC_MSMPEG4TAB_H
+#define AVCODEC_MSMPEG4TAB_H
+
 #include <stdint.h>
 #include "bitstream.h"
 #include "rl.h"
@@ -2016,3 +2019,5 @@
 0x38, 0x29, 0x22, 0x03, 0x31, 0x39, 0x0B, 0x2A,
 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B,
 };
+
+#endif
--- a/ppc/mathops.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/ppc/mathops.h	Sun Jun 17 00:01:30 2007 +0000
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_PPC_MATHOPS_H
+#define AVCODEC_PPC_MATHOPS_H
+
 #if defined(ARCH_POWERPC_405)
 /* signed 16x16 -> 32 multiply add accumulate */
 #   define MAC16(rt, ra, rb) \
@@ -31,3 +34,5 @@
          asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb));
          __rt; })
 #endif
+
+#endif
--- a/ppc/types_altivec.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/ppc/types_altivec.h	Sun Jun 17 00:01:30 2007 +0000
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_TYPES_ALTIVEC_H
+#define AVCODEC_TYPES_ALTIVEC_H
+
 /***********************************************************************
  * Vector types
  **********************************************************************/
@@ -39,3 +42,5 @@
 #define zero_s16v (vec_s16_t) zerov
 #define zero_u32v (vec_u32_t) zerov
 #define zero_s32v (vec_s32_t) zerov
+
+#endif
--- a/rangecoder.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/rangecoder.h	Sun Jun 17 00:01:30 2007 +0000
@@ -25,6 +25,9 @@
  * Range coder.
  */
 
+#ifndef AVCODEC_RANGECODER_H
+#define AVCODEC_RANGECODER_H
+
 #include <stdint.h>
 #include <assert.h>
 #include "common.h"
@@ -136,3 +139,4 @@
 #endif
 }
 
+#endif
--- a/roqvideo.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/roqvideo.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef AVCODEC_ROQVIDEO_H
+#define AVCODEC_ROQVIDEO_H
+
 #include "avcodec.h"
 #include "dsputil.h"
 
@@ -66,3 +69,5 @@
 void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay);
 
 void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay);
+
+#endif
--- a/simple_idct.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/simple_idct.h	Sun Jun 17 00:01:30 2007 +0000
@@ -25,6 +25,9 @@
  * simple idct header.
  */
 
+#ifndef AVCODEC_SIMPLE_IDCT_H
+#define AVCODEC_SIMPLE_IDCT_H
+
 #include <stdint.h>
 #include "dsputil.h"
 
@@ -39,3 +42,5 @@
 
 void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
 void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
+
+#endif
--- a/sparc/vis.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/sparc/vis.h	Sun Jun 17 00:01:30 2007 +0000
@@ -40,6 +40,9 @@
  * the assembler to keep the binary from becoming tainted.
  */
 
+#ifndef AVCODEC_VIS_H
+#define AVCODEC_VIS_H
+
 #define vis_opc_base    ((0x1 << 31) | (0x36 << 19))
 #define vis_opf(X)      ((X) << 5)
 #define vis_sreg(X)     (X)
@@ -325,3 +328,5 @@
 /* Pixel component distance.  */
 
 #define vis_pdist(rs1,rs2,rd)           vis_dd2d(0x3e, rs1, rs2, rd)
+
+#endif
--- a/svq1_cb.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/svq1_cb.h	Sun Jun 17 00:01:30 2007 +0000
@@ -29,6 +29,9 @@
  * svq1 code books.
  */
 
+#ifndef AVCODEC_SVQ1_CB_H
+#define AVCODEC_SVQ1_CB_H
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -1581,3 +1584,5 @@
  -1,  5, -2, -2, -3,  2, -3, -1,  3, -3,  0,  4,  3,  0,  1, -2,
  }
 };
+
+#endif
--- a/ulti_cb.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/ulti_cb.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_ULTI_CB_H
+#define AVCODEC_ULTI_CB_H
+
 static const unsigned char ulti_codebook[16384]={
     0x00, 0x01, 0x01, 0x02,
     0x00, 0x01, 0x02, 0x03,
@@ -4117,3 +4120,5 @@
     0x3C, 0x3D, 0x3E, 0x3F,
     0x3D, 0x3E, 0x3E, 0x3F
 };
+
+#endif
--- a/vc1.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/vc1.h	Sun Jun 17 00:01:30 2007 +0000
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_VC1_H
+#define AVCODEC_VC1_H
+
 #include "avcodec.h"
 #include "mpegvideo.h"
 
@@ -300,3 +303,5 @@
     int p_frame_skipped;
     int bi_type;
 } VC1Context;
+
+#endif
--- a/vc1acdata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/vc1acdata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_VC1ACDATA_H
+#define AVCODEC_VC1ACDATA_H
+
 #include <stdint.h>
 
 #define AC_MODES 8
@@ -585,3 +588,5 @@
       -1,    30,    28,     3,     0
 }
 };
+
+#endif
--- a/vorbis_enc_data.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/vorbis_enc_data.h	Sun Jun 17 00:01:30 2007 +0000
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef AVCODEC_VORBIS_ENC_DATA_H
+#define AVCODEC_VORBIS_ENC_DATA_H
+
 #include <stdint.h>
 
 static const uint8_t codebook0[] = {
@@ -498,3 +501,5 @@
     { 4, 2, 2, (const int[]){ -1,  9, 10, 11 } },
     { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } },
 };
+
+#endif
--- a/wmadata.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/wmadata.h	Sun Jun 17 00:01:30 2007 +0000
@@ -24,6 +24,9 @@
  * Various WMA tables.
  */
 
+#ifndef AVCODEC_WMADATA_H
+#define AVCODEC_WMADATA_H
+
 #include <stdint.h>
 #include "wma.h"
 
@@ -1434,3 +1437,5 @@
         sizeof(coef5_huffbits), sizeof(levels5)/2, coef5_huffcodes, coef5_huffbits, levels5,
     },
 };
+
+#endif
--- a/xiph.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/xiph.h	Sun Jun 17 00:01:30 2007 +0000
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_XIPH_H
+#define AVCODEC_XIPH_H
+
 #include "common.h"
 
 /**
@@ -36,3 +39,5 @@
 int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
                           int first_header_size, uint8_t *header_start[3],
                           int header_len[3]);
+
+#endif
--- a/xvmc_render.h	Sat Jun 16 22:59:13 2007 +0000
+++ b/xvmc_render.h	Sun Jun 17 00:01:30 2007 +0000
@@ -1,3 +1,6 @@
+#ifndef AVCODEC_XVMC_RENDER_H
+#define AVCODEC_XVMC_RENDER_H
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
@@ -48,3 +51,5 @@
   void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered
 
 } xvmc_render_state_t;
+
+#endif