Commit 699b3f99 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

add multiple inclusion guards to headers

Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 99545457
......@@ -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
......@@ -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 @@ static const float qmf_48tap_half[24] = {
/* 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
#ifndef AVCODEC_BETHSOFTVIDEO_H
#define AVCODEC_BETHSOFTVIDEO_H
enum BethsoftVidBlockType
{
PALETTE_BLOCK = 0x02,
......@@ -8,3 +11,5 @@ enum BethsoftVidBlockType
VIDEO_YOFF_P_FRAME = 0x04,
EOF_BLOCK = 0x14,
};
#endif
......@@ -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 @@ typedef enum {
BMP_RLE4 =2,
BMP_BITFIELDS =3,
} BiCompression;
#endif
......@@ -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 left_modifier_l[8] = { 0,-1, 6,-1,-1, 7, 6, 7};
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
......@@ -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 cplscale6[63] = {
static const float* cplscales[5] = {
cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
};
#endif
......@@ -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
......@@ -24,6 +24,9 @@
* @file dcadata.c
*/
#ifndef AVCODEC_DCADATA_H
#define AVCODEC_DCADATA_H
#include <stdint.h>
/* Generic tables */
......@@ -8467,3 +8470,5 @@ where Ch(n) represents the subband samples in the (n)th audio channel.
*/
#endif
......@@ -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 @@ static const uint8_t* bitalloc_bits[10][8] = {
{ 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
......@@ -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_bits[62] = {
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
......@@ -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 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
buf[2] = 0xff; /* reserved -- always 1 */
return 3;
}
#endif
......@@ -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_do_elbg(int *points, int dim, int numpoints, int *codebook,
void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
int numCB, int num_steps, int *closest_cb,
AVRandomState *rand_state);
#endif
......@@ -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
......@@ -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 @@ static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit
set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
}
#endif
......@@ -25,6 +25,9 @@
* h261codec.
*/
#ifndef AVCODEC_H261_H
#define AVCODEC_H261_H
#include "mpegvideo.h"
/**
......@@ -44,3 +47,5 @@ typedef struct H261Context{
}H261Context;
#define MB_TYPE_H261_FIL 0x800000
#endif
......@@ -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 @@ static RLTable h261_rl_tcoeff = {
h261_tcoeff_run,
h261_tcoeff_level,
};
#endif
......@@ -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
......@@ -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 @@ const uint8_t ff_h263_loop_filter_strength[32]={
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
......@@ -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 @@ static const int cabac_context_init_PB[3][460][2] =
{ 31, 12 }, { 37, 23 }, { 31, 38 }, { 20, 64 },
}
};
#endif
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment