[Ffmpeg-devel] [PATCH] add ifndef to some *.h files of libavcodec
Limin Wang
lance.lmwang
Thu Apr 12 13:26:00 CEST 2007
Hi,
The patch try to add ifndef/define macros to avoid the head file is included
more than once. imgconvert_template.h is excepted for it must include more than
once, I think it's bad idea. I have passed "make test", please review it.
Thanks,
Limin
-------------- next part --------------
Index: libavcodec/cookdata.h
===================================================================
--- libavcodec/cookdata.h (revision 8717)
+++ libavcodec/cookdata.h (working copy)
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+#ifndef FFMPEG_COOKDATA_H
+#define FFMPEG_COOKDATA_H
/**
* @file cookdata.h
@@ -557,3 +559,5 @@
static const float* cplscales[5] = {
cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
};
+
+#endif /* FFMPEG_COOKDATA_H */
Index: libavcodec/h263data.h
===================================================================
--- libavcodec/h263data.h (revision 8717)
+++ libavcodec/h263data.h (working copy)
@@ -20,7 +20,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_H263DATA_H
+#define FFMPEG_H263DATA_H
/**
* @file h263data.h
* H.263 tables.
@@ -306,3 +307,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 /* FFMPEG_H263DATA_H */
Index: libavcodec/cavsdata.h
===================================================================
--- libavcodec/cavsdata.h (revision 8717)
+++ libavcodec/cavsdata.h (working copy)
@@ -18,6 +18,8 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef FFMPEG_CAVSDATA_H
+#define FFMPEG_CAVSDATA_H
#define SLICE_MIN_START_CODE 0x00000101
#define SLICE_MAX_START_CODE 0x000001af
@@ -641,3 +643,6 @@
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 /* CONFIG_CAVS_DECODER */
+
+
+#endif /* FFMPEG_CAVSDATA_H */
Index: libavcodec/bethsoftvideo.h
===================================================================
--- libavcodec/bethsoftvideo.h (revision 8717)
+++ libavcodec/bethsoftvideo.h (working copy)
@@ -1,3 +1,6 @@
+#ifndef FFMPEG_BETHSOFTVIDEO_H
+#define FFMPEG_BETHSOFTVIDEO_H
+
enum BethsoftVidBlockType
{
PALETTE_BLOCK = 0x02,
@@ -8,3 +11,5 @@
VIDEO_YOFF_P_FRAME = 0x04,
EOF_BLOCK = 0x14,
};
+
+#endif /* FFMPEG_BETHSOFTVIDEO_H */
Index: libavcodec/ac3tab.h
===================================================================
--- libavcodec/ac3tab.h (revision 8717)
+++ libavcodec/ac3tab.h (working copy)
@@ -18,6 +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_AC3TAB_H
+#define FFMPEG_AC3TAB_H
/**
* @file ac3tab.h
@@ -249,3 +251,6 @@
};
static uint8_t bndtab[51];
+
+
+#endif /* FFMPEG_AC3TAB_H */
Index: libavcodec/mpegaudio.h
===================================================================
--- libavcodec/mpegaudio.h (revision 8717)
+++ libavcodec/mpegaudio.h (working copy)
@@ -17,7 +17,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_MPEGAUDIO_H
+#define FFMPEG_MPEGAUDIO_H
/**
* @file mpegaudio.h
* mpeg audio declarations for both encoder and decoder.
@@ -104,3 +105,5 @@
return -1;
return 0;
}
+
+#endif /* FFMPEG_MPEGAUDIO_H */
Index: libavcodec/xvmc_render.h
===================================================================
--- libavcodec/xvmc_render.h (revision 8717)
+++ libavcodec/xvmc_render.h (working copy)
@@ -1,3 +1,5 @@
+#ifndef FFMPEG_XVMC_RENDER_H
+#define FFMPEG_XVMC_RENDER_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@@ -48,3 +50,5 @@
void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered
} xvmc_render_state_t;
+
+#endif /* FFMPEG_XVMC_RENDER_H */
Index: libavcodec/ulti_cb.h
===================================================================
--- libavcodec/ulti_cb.h (revision 8717)
+++ libavcodec/ulti_cb.h (working copy)
@@ -18,6 +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_ULTI_CB_H
+#define FFMPEG_ULTI_CB_H
static const unsigned char ulti_codebook[16384]={
0x00, 0x01, 0x01, 0x02,
@@ -4117,3 +4119,5 @@
0x3C, 0x3D, 0x3E, 0x3F,
0x3D, 0x3E, 0x3E, 0x3F
};
+
+#endif /* FFMPEG_ULTI_CB_H */
Index: libavcodec/imcdata.h
===================================================================
--- libavcodec/imcdata.h (revision 8717)
+++ libavcodec/imcdata.h (working copy)
@@ -21,6 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+#ifndef FFMPEG_IMCDATA_H
+#define FFMPEG_IMCDATA_H
static const uint16_t band_tab[33] = {
0, 3, 6, 9, 12, 16, 20, 24, 29, 34, 40,
@@ -162,3 +164,4 @@
}
};
+#endif /* FFMPEG_IMCDATA_H */
Index: libavcodec/golomb.h
===================================================================
--- libavcodec/golomb.h (revision 8717)
+++ libavcodec/golomb.h (working copy)
@@ -20,7 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
-
+#ifndef FFMPEG_GOLOMB_H
+#define FFMPEG_GOLOMB_H
/**
* @file golomb.h
* @brief
@@ -477,3 +478,5 @@
set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
}
+
+#endif /* FFMPEG_GOLOMB_H */
Index: libavcodec/mpegaudiotab.h
===================================================================
--- libavcodec/mpegaudiotab.h (revision 8717)
+++ libavcodec/mpegaudiotab.h (working copy)
@@ -20,7 +20,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 MPEGAUDIOTAB_H
+#define MPEGAUDIOTAB_H
/**
* @file mpegaudiotab.h
* mpeg audio layer 2 tables.
@@ -109,3 +110,4 @@
static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 };
+#endif /* MPEGAUDIOTAB_H */
Index: libavcodec/h261data.h
===================================================================
--- libavcodec/h261data.h (revision 8717)
+++ libavcodec/h261data.h (working copy)
@@ -18,7 +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_H261DATA_H
+#define FFMPEG_H261DATA_H
/**
* @file h261data.h
* H.261 tables.
@@ -155,3 +156,5 @@
h261_tcoeff_run,
h261_tcoeff_level,
};
+
+#endif /* FFMPEG_H261DATA_H */
Index: libavcodec/mpeg4data.h
===================================================================
--- libavcodec/mpeg4data.h (revision 8717)
+++ libavcodec/mpeg4data.h (working copy)
@@ -19,7 +19,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_MPEG4DATA_H
+#define FFMPEG_MPEG4DATA_H
/**
* @file mpeg4data.h
* mpeg4 tables.
@@ -421,3 +422,5 @@
static const uint8_t mpeg4_dc_threshold[8]={
99, 13, 15, 17, 19, 21, 23, 0
};
+
+#endif /* FFMPEG_MPEG4DATA_H */
Index: libavcodec/indeo2data.h
===================================================================
--- libavcodec/indeo2data.h (revision 8717)
+++ libavcodec/indeo2data.h (working copy)
@@ -18,6 +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_INDEO2DATA_H
+#define FFMPEG_INDEO2DATA_H
#define IR2_CODES 143
static const uint16_t ir2_codes[IR2_CODES][2] = {
@@ -132,3 +134,5 @@
0x28, 0x5C, 0x6C, 0xC1, 0x94, 0x3F, 0xC1, 0x6C,
0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
};
+
+#endif
Index: libavcodec/h264data.h
===================================================================
--- libavcodec/h264data.h (revision 8717)
+++ libavcodec/h264data.h (working copy)
@@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
-
+#ifndef FFMPEG_H264DATA_H
+#define FFMPEG_H264DATA_H
/**
* @file h264data.h
* @brief
@@ -1321,3 +1322,5 @@
{ 31, 12 }, { 37, 23 }, { 31, 38 }, { 20, 64 },
}
};
+
+#endif /* FFMPEG_H264DATA_H */
Index: libavcodec/mpegaudiodectab.h
===================================================================
--- libavcodec/mpegaudiodectab.h (revision 8717)
+++ libavcodec/mpegaudiodectab.h (working copy)
@@ -18,7 +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 MPEGAUDIODECTAB_H
+#define MPEGAUDIODECTAB_H
/**
* @file mpegaudiodectab.h
* mpeg audio layer decoder tables.
@@ -793,3 +794,5 @@
static const float ci_table[8] = {
-0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037,
};
+
+#endif /* MPEGAUDIODECTAB_H */
Index: libavcodec/wmadata.h
===================================================================
--- libavcodec/wmadata.h (revision 8717)
+++ libavcodec/wmadata.h (working copy)
@@ -18,7 +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_WMADATA_H
+#define FFMPEG_WMADATA_H
/**
* @file wmadata.h
* Various WMA tables.
@@ -1431,3 +1432,5 @@
sizeof(coef5_huffbits), sizeof(levels5)/2, coef5_huffcodes, coef5_huffbits, levels5,
},
};
+
+#endif /* FFMPEG_WMADATA_H */
Index: libavcodec/mpcdata.h
===================================================================
--- libavcodec/mpcdata.h (revision 8717)
+++ libavcodec/mpcdata.h (working copy)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+#ifndef FFMPEG_MPCDATA_H
+#define FFMPEG_MPCDATA_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};
static const int8_t mpc_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1};
@@ -204,3 +206,5 @@
0.000000092001613439, 0.000000076635565449, 0.000000063835940978, 0.000000053174105119,
0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
};
+
+#endif /* FFMPEG_MPCDATA_H */
Index: libavcodec/dcadata.h
===================================================================
--- libavcodec/dcadata.h (revision 8717)
+++ libavcodec/dcadata.h (working copy)
@@ -19,6 +19,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_DCADATA_H
+#define FFMPEG_DCADATA_H
/**
* @file dcadata.c
@@ -8452,3 +8454,5 @@
*/
+
+#endif /* FFMPEG_DCADATA_H */
Index: libavcodec/cabac.h
===================================================================
--- libavcodec/cabac.h (revision 8717)
+++ libavcodec/cabac.h (working copy)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+#ifndef FFMPEG_CABAC_H
+#define FFMPEG_CABAC_H
/**
* @file cabac.h
@@ -857,3 +859,6 @@
}else
return i;
}
+
+
+#endif /* FFMPEG_CABAC_H */
Index: libavcodec/simple_idct.h
===================================================================
--- libavcodec/simple_idct.h (revision 8717)
+++ libavcodec/simple_idct.h (working copy)
@@ -19,7 +19,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 SIMPLE_IDCT_H
+#define SIMPLE_IDCT_H
/**
* @file simple_idct.h
* simple idct header.
@@ -36,3 +37,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 /* SIMPLE_IDCT_H */
Index: libavcodec/msmpeg4data.h
===================================================================
--- libavcodec/msmpeg4data.h (revision 8717)
+++ libavcodec/msmpeg4data.h (working copy)
@@ -21,7 +21,8 @@
*
* msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni at gmx.at>
*/
-
+#ifndef FFMPEG_MSMPEG4DATA_H
+#define FFMPEG_MSMPEG4DATA_H
/**
* @file msmpeg4data.h
* MSMPEG4 data tables.
@@ -2026,3 +2027,5 @@
0x38, 0x29, 0x22, 0x03, 0x31, 0x39, 0x0B, 0x2A,
0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B,
};
+
+#endif /* FFMPEG_MSMPEG4DATA_H */
Index: libavcodec/bmp.h
===================================================================
--- libavcodec/bmp.h (revision 8717)
+++ libavcodec/bmp.h (working copy)
@@ -18,6 +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_BMP_H
+#define FFMPEG_BMP_H
typedef struct BMPContext {
AVFrame picture;
@@ -29,3 +31,5 @@
BMP_RLE4 =2,
BMP_BITFIELDS =3,
} BiCompression;
+
+#endif /* FFMPEG_BMP_H */
Index: libavcodec/vc1acdata.h
===================================================================
--- libavcodec/vc1acdata.h (revision 8717)
+++ libavcodec/vc1acdata.h (working copy)
@@ -18,6 +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_VC1ACDATA_H
+#define FFMPEG_VC1ACDATA_H
#define AC_MODES 8
@@ -583,3 +585,5 @@
-1, 30, 28, 3, 0
}
};
+
+#endif /* FFMPEG_VC1ACDATA_H */
Index: libavcodec/dnxhddata.h
===================================================================
--- libavcodec/dnxhddata.h (revision 8717)
+++ libavcodec/dnxhddata.h (working copy)
@@ -18,6 +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_DNXHDDATA_H
+#define FFMPEG_DNXHDDATA_H
static const uint8_t dnxhd_1238_luma_weigth[] = {
0, 32, 32, 33, 34, 33, 33, 33,
@@ -104,3 +106,6 @@
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 /* FFMPEG_DNXHDDATA_H */
Index: libavcodec/dvdata.h
===================================================================
--- libavcodec/dvdata.h (revision 8717)
+++ libavcodec/dvdata.h (working copy)
@@ -18,7 +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_DVDATA_H
+#define FFMPEG_DVDATA_H
/**
* @file dvdata.h
* Constants for DV codec.
@@ -2722,3 +2723,5 @@
buf[2] = 0xff; /* reserved -- always 1 */
return 3;
}
+
+#endif /* FFMPEG_DVDATA_H */
Index: libavcodec/xiph.h
===================================================================
--- libavcodec/xiph.h (revision 8717)
+++ libavcodec/xiph.h (working copy)
@@ -17,7 +17,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_XIPH_H
+#define FFMPEG_XIPH_H
#include "common.h"
/**
@@ -36,3 +37,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 /* FFMPEG_XIPH_H */
Index: libavcodec/rangecoder.h
===================================================================
--- libavcodec/rangecoder.h (revision 8717)
+++ libavcodec/rangecoder.h (working copy)
@@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
-
+#ifndef FFMPEG_RANGECODER_H
+#define FFMPEG_RANGECODER_H
/**
* @file rangecoder.h
* Range coder.
@@ -125,3 +126,4 @@
#endif
}
+#endif /* FFMPEG_RANGECODER_H */
Index: libavcodec/mpeg12data.h
===================================================================
--- libavcodec/mpeg12data.h (revision 8717)
+++ libavcodec/mpeg12data.h (working copy)
@@ -19,7 +19,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_MPEG12DATA_H
+#define FFMPEG_MPEG12DATA_H
/**
* @file mpeg12data.h
* MPEG1/2 tables.
@@ -472,3 +473,5 @@
0xff, 0xff, 0xff,
0xff, 0xff, 0xff,
};
+
+#endif /* FFMPEG_MPEG12DATA_H */
Index: libavcodec/faandct.h
===================================================================
--- libavcodec/faandct.h (revision 8717)
+++ libavcodec/faandct.h (working copy)
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+#ifndef FFMPEG_FAANDCT_H
+#define FFMPEG_FAANDCT_H
/**
* @file faandct.h
@@ -31,3 +33,5 @@
void ff_faandct(DCTELEM * data);
void ff_faandct248(DCTELEM * data);
+
+#endif /* FFMPEG_FAANDCT_H */
Index: libavcodec/indeo3data.h
===================================================================
--- libavcodec/indeo3data.h (revision 8717)
+++ libavcodec/indeo3data.h (working copy)
@@ -18,6 +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_INDEO3DATA_H
+#define FFMPEG_INDEO3DATA_H
static const uint32_t correction[] = {
0x00000000, 0x00000202, 0xfffffdfe, 0x000002ff, 0xfffffd01, 0xffffff03, 0x000000fd, 0x00000404,
@@ -2333,3 +2335,5 @@
0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
};
+
+#endif /* FFMPEG_INDEO3DATA_H */
Index: libavcodec/svq1_cb.h
===================================================================
--- libavcodec/svq1_cb.h (revision 8717)
+++ libavcodec/svq1_cb.h (working copy)
@@ -23,7 +23,8 @@
* Ported to libavcodec by Nick Kurshev <nickols_k at mail.ru>
*
*/
-
+#ifndef FFMPEG_SVQ1_CB_H
+#define FFMPEG_SVQ1_CB_H
/**
* @file svq1_cb.h
* svq1 code books.
@@ -1578,3 +1579,5 @@
-1, 5, -2, -2, -3, 2, -3, -1, 3, -3, 0, 4, 3, 0, 1, -2,
}
};
+
+#endif /* FFMPEG_SVQ1_CB_H */
Index: libavcodec/dcahuff.h
===================================================================
--- libavcodec/dcahuff.h (revision 8717)
+++ libavcodec/dcahuff.h (working copy)
@@ -19,6 +19,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_DCAHUFF_H
+#define FFMPEG_DCAHUFF_H
#define TMODE_COUNT 4
static const uint8_t tmode_vlc_bits[TMODE_COUNT] = { 3, 3, 3, 2 };
@@ -1066,3 +1068,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 /* FFMPEG_DCAHUFF_H */
Index: libavcodec/vorbis_enc_data.h
===================================================================
--- libavcodec/vorbis_enc_data.h (revision 8717)
+++ libavcodec/vorbis_enc_data.h (working copy)
@@ -17,6 +17,8 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef VORBIS_ENC_DATA_H
+#define VORBIS_ENC_DATA_H
static const uint8_t codebook0[] = {
2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7,
@@ -496,3 +498,5 @@
{ 4, 2, 2, (const int[]){ -1, 9, 10, 11 } },
{ 3, 2, 3, (const int[]){ -1, 12, 13, 14 } },
};
+
+#endif /* VORBIS_ENC_DATA_H */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 481 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070412/5a1174cb/attachment.pgp>
More information about the ffmpeg-devel
mailing list