From 5b21bdabe43611385d1d55a21d5b1f607b133d29 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 17 Oct 2007 09:37:46 +0000 Subject: Add FFMPEG_ prefix to all multiple inclusion guards. Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/adler32.h | 6 +++--- libavutil/aes.h | 6 +++--- libavutil/avstring.h | 6 +++--- libavutil/avutil.h | 6 +++--- libavutil/base64.h | 6 +++--- libavutil/bswap.h | 6 +++--- libavutil/common.h | 6 +++--- libavutil/crc.h | 6 +++--- libavutil/fifo.h | 6 +++--- libavutil/integer.h | 6 +++--- libavutil/internal.h | 6 +++--- libavutil/intfloat_readwrite.h | 6 +++--- libavutil/intreadwrite.h | 6 +++--- libavutil/lls.h | 6 +++--- libavutil/log.h | 6 +++--- libavutil/lzo.h | 6 +++--- libavutil/mathematics.h | 6 +++--- libavutil/md5.h | 6 +++--- libavutil/mem.h | 6 +++--- libavutil/random.h | 6 +++--- libavutil/rational.h | 6 +++--- libavutil/rc4.h | 6 +++--- libavutil/sha1.h | 7 ++++--- libavutil/softfloat.h | 6 +++--- libavutil/tree.h | 6 +++--- libavutil/x86_cpu.h | 6 +++--- 26 files changed, 79 insertions(+), 78 deletions(-) (limited to 'libavutil') diff --git a/libavutil/adler32.h b/libavutil/adler32.h index 223cbfd..2e29e05 100644 --- a/libavutil/adler32.h +++ b/libavutil/adler32.h @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef ADLER32_H -#define ADLER32_H +#ifndef FFMPEG_ADLER32_H +#define FFMPEG_ADLER32_H #include unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len); -#endif +#endif /* FFMPEG_ADLER32_H */ diff --git a/libavutil/aes.h b/libavutil/aes.h index a4ee1f9..438ba17 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AES_H -#define AES_H +#ifndef FFMPEG_AES_H +#define FFMPEG_AES_H #include @@ -44,4 +44,4 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); */ void av_aes_crypt(struct AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt); -#endif /* AES_H */ +#endif /* FFMPEG_AES_H */ diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 9541745..ecac9e6 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_AVSTRING_H -#define AVUTIL_AVSTRING_H +#ifndef FFMPEG_AVSTRING_H +#define FFMPEG_AVSTRING_H #include @@ -87,4 +87,4 @@ size_t av_strlcat(char *dst, const char *src, size_t size); */ size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...); -#endif /* AVUTIL_AVSTRING_H */ +#endif /* FFMPEG_AVSTRING_H */ diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 7025286..764ae84 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_H -#define AVUTIL_H +#ifndef FFMPEG_AVUTIL_H +#define FFMPEG_AVUTIL_H /** * @file avutil.h @@ -129,4 +129,4 @@ enum PixelFormat { #define PIX_FMT_YUV422 PIX_FMT_YUYV422 #endif -#endif /* AVUTIL_H */ +#endif /* FFMPEG_AVUTIL_H */ diff --git a/libavutil/base64.h b/libavutil/base64.h index 1ee7014..e05ead1 100644 --- a/libavutil/base64.h +++ b/libavutil/base64.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_BASE64_H -#define AVUTIL_BASE64_H +#ifndef FFMPEG_BASE64_H +#define FFMPEG_BASE64_H #include @@ -37,4 +37,4 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length); */ char *av_base64_encode(char * buf, int buf_len, uint8_t * src, int len); -#endif // AVUTIL_BASE64_H +#endif /* FFMPEG_BASE64_H */ diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 211a15c..850cbe3 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -23,8 +23,8 @@ * byte swap. */ -#ifndef BSWAP_H -#define BSWAP_H +#ifndef FFMPEG_BSWAP_H +#define FFMPEG_BSWAP_H #include #include "common.h" @@ -138,4 +138,4 @@ static inline uint64_t bswap_64(uint64_t x) #define le2me_64(x) (x) #endif -#endif /* BSWAP_H */ +#endif /* FFMPEG_BSWAP_H */ diff --git a/libavutil/common.h b/libavutil/common.h index 9550403..f2dd83b 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -23,8 +23,8 @@ * common internal and external api header. */ -#ifndef COMMON_H -#define COMMON_H +#ifndef FFMPEG_COMMON_H +#define FFMPEG_COMMON_H #include @@ -366,4 +366,4 @@ tend= AV_READ_TIME();\ #define STOP_TIMER(id) {} #endif -#endif /* COMMON_H */ +#endif /* FFMPEG_COMMON_H */ diff --git a/libavutil/crc.h b/libavutil/crc.h index 4fdc4bb..c6205c1 100644 --- a/libavutil/crc.h +++ b/libavutil/crc.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef CRC_H -#define CRC_H +#ifndef FFMPEG_CRC_H +#define FFMPEG_CRC_H #include #include @@ -48,5 +48,5 @@ extern AVCRC av_crc07 []; int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size); uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length); -#endif /* CRC_H */ +#endif /* FFMPEG_CRC_H */ diff --git a/libavutil/fifo.h b/libavutil/fifo.h index 278a8c8..817a8a6 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -21,8 +21,8 @@ * A very simple circular buffer FIFO implementation. */ -#ifndef FIFO_H -#define FIFO_H +#ifndef FFMPEG_FIFO_H +#define FFMPEG_FIFO_H #include @@ -99,4 +99,4 @@ static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs) ptr -= f->end - f->buffer; return *ptr; } -#endif /* FIFO_H */ +#endif /* FFMPEG_FIFO_H */ diff --git a/libavutil/integer.h b/libavutil/integer.h index 2a1df34..f539125 100644 --- a/libavutil/integer.h +++ b/libavutil/integer.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer */ -#ifndef INTEGER_H -#define INTEGER_H +#ifndef FFMPEG_INTEGER_H +#define FFMPEG_INTEGER_H #include @@ -80,4 +80,4 @@ AVInteger av_int2i(int64_t a); */ int64_t av_i2int(AVInteger a); -#endif // INTEGER_H +#endif /* FFMPEG_INTEGER_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 1ae163f..47472ce 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -23,8 +23,8 @@ * common internal api header. */ -#ifndef INTERNAL_H -#define INTERNAL_H +#ifndef FFMPEG_INTERNAL_H +#define FFMPEG_INTERNAL_H #if !defined(DEBUG) && !defined(NDEBUG) # define NDEBUG @@ -278,4 +278,4 @@ static av_always_inline long int lrintf(float x) } #endif /* HAVE_LRINTF */ -#endif /* INTERNAL_H */ +#endif /* FFMPEG_INTERNAL_H */ diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h index c535b64..fe7fe35 100644 --- a/libavutil/intfloat_readwrite.h +++ b/libavutil/intfloat_readwrite.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef INTFLOAT_READWRITE_H -#define INTFLOAT_READWRITE_H +#ifndef FFMPEG_INTFLOAT_READWRITE_H +#define FFMPEG_INTFLOAT_READWRITE_H #include "common.h" @@ -36,4 +36,4 @@ int64_t av_dbl2int(double d); int32_t av_flt2int(float d); AVExtFloat av_dbl2ext(double d); -#endif /* INTFLOAT_READWRITE_H */ +#endif /* FFMPEG_INTFLOAT_READWRITE_H */ diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index d6c1b67..9832b56 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef INTREADWRITE_H -#define INTREADWRITE_H +#ifndef FFMPEG_INTREADWRITE_H +#define FFMPEG_INTREADWRITE_H #include #include "bswap.h" @@ -186,4 +186,4 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed)); ((uint8_t*)(p))[7] = (d)>>56; } while(0) #endif -#endif /* INTREADWRITE_H */ +#endif /* FFMPEG_INTREADWRITE_H */ diff --git a/libavutil/lls.h b/libavutil/lls.h index e6d352a..90b2332 100644 --- a/libavutil/lls.h +++ b/libavutil/lls.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LLS_H -#define LLS_H +#ifndef FFMPEG_LLS_H +#define FFMPEG_LLS_H #define MAX_VARS 32 @@ -42,4 +42,4 @@ void av_update_lls(LLSModel *m, double *param, double decay); void av_solve_lls(LLSModel *m, double threshold, int min_order); double av_evaluate_lls(LLSModel *m, double *param, int order); -#endif +#endif /* FFMPEG_LLS_H */ diff --git a/libavutil/log.h b/libavutil/log.h index fa88f5f..2430372 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LOG_H -#define LOG_H +#ifndef FFMPEG_LOG_H +#define FFMPEG_LOG_H #include @@ -113,4 +113,4 @@ extern void av_log_default_callback(void* ptr, int level, const char* fmt, va_li extern void (*av_vlog)(void*, int, const char*, va_list); #endif -#endif /* LOG_H */ +#endif /* FFMPEG_LOG_H */ diff --git a/libavutil/lzo.h b/libavutil/lzo.h index 5b3d98f..00427c1 100644 --- a/libavutil/lzo.h +++ b/libavutil/lzo.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LZO_H -#define LZO_H +#ifndef FFMPEG_LZO_H +#define FFMPEG_LZO_H #define LZO_INPUT_DEPLETED 1 #define LZO_OUTPUT_FULL 2 @@ -32,4 +32,4 @@ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen); -#endif +#endif /* FFMPEG_LZO_H */ diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h index 0b74b25..a0c2862 100644 --- a/libavutil/mathematics.h +++ b/libavutil/mathematics.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MATHEMATICS_H -#define MATHEMATICS_H +#ifndef FFMPEG_MATHEMATICS_H +#define FFMPEG_MATHEMATICS_H #include "rational.h" @@ -48,4 +48,4 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding); */ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq); -#endif /* MATHEMATICS_H */ +#endif /* FFMPEG_MATHEMATICS_H */ diff --git a/libavutil/md5.h b/libavutil/md5.h index fa83b1c..7d63df0 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MD5_H -#define MD5_H +#ifndef FFMPEG_MD5_H +#define FFMPEG_MD5_H #include @@ -32,5 +32,5 @@ void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len); void av_md5_final(struct AVMD5 *ctx, uint8_t *dst); void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len); -#endif /* MD5_H */ +#endif /* FFMPEG_MD5_H */ diff --git a/libavutil/mem.h b/libavutil/mem.h index 0d3e7f3..db49c8d 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -23,8 +23,8 @@ * Memory handling functions. */ -#ifndef AV_MEM_H -#define AV_MEM_H +#ifndef FFMPEG_MEM_H +#define FFMPEG_MEM_H #ifdef __GNUC__ #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) @@ -69,4 +69,4 @@ char *av_strdup(const char *s); */ void av_freep(void *ptr); -#endif /* AV_MEM_H */ +#endif /* FFMPEG_MEM_H */ diff --git a/libavutil/random.h b/libavutil/random.h index d9d08a5..4d00d7e 100644 --- a/libavutil/random.h +++ b/libavutil/random.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AV_RANDOM_H -#define AV_RANDOM_H +#ifndef FFMPEG_RANDOM_H +#define FFMPEG_RANDOM_H #define AV_RANDOM_N 624 @@ -65,5 +65,5 @@ static inline double av_random_real1(AVRandomState *state) // only available if DEBUG is defined in the .c file void av_benchmark_random(void); -#endif // AV_RANDOM_H +#endif /* FFMPEG_RANDOM_H */ diff --git a/libavutil/rational.h b/libavutil/rational.h index 8826772..f53f278 100644 --- a/libavutil/rational.h +++ b/libavutil/rational.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer */ -#ifndef RATIONAL_H -#define RATIONAL_H +#ifndef FFMPEG_RATIONAL_H +#define FFMPEG_RATIONAL_H #include @@ -112,4 +112,4 @@ AVRational av_sub_q(AVRational b, AVRational c); */ AVRational av_d2q(double d, int max); -#endif // RATIONAL_H +#endif /* FFMPEG_RATIONAL_H */ diff --git a/libavutil/rc4.h b/libavutil/rc4.h index d3b8e6c..5e4f086 100644 --- a/libavutil/rc4.h +++ b/libavutil/rc4.h @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RC4_H -#define RC4_H +#ifndef FFMPEG_RC4_H +#define FFMPEG_RC4_H void ff_rc4_enc(const uint8_t *key, int keylen, uint8_t *data, int datalen); -#endif /* RC4_H */ +#endif /* FFMPEG_RC4_H */ diff --git a/libavutil/sha1.h b/libavutil/sha1.h index 87974a2..f00ecf0 100644 --- a/libavutil/sha1.h +++ b/libavutil/sha1.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AV_SHA1_H -#define AV_SHA1_H +#ifndef FFMPEG_SHA1_H +#define FFMPEG_SHA1_H #include @@ -30,4 +30,5 @@ struct AVSHA1; void av_sha1_init(struct AVSHA1* context); void av_sha1_update(struct AVSHA1* context, uint8_t* data, unsigned int len); void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]); -#endif + +#endif /* FFMPEG_SHA1_H */ diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index a0d614b..d1a1901 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_SOFTFLOAT_H -#define AVUTIL_SOFTFLOAT_H +#ifndef FFMPEG_SOFTFLOAT_H +#define FFMPEG_SOFTFLOAT_H #include @@ -125,4 +125,4 @@ static inline int av_sf2int(SoftFloat v, int frac_bits){ else return v.mant >>(-v.exp); } -#endif // AVUTIL_SOFTFLOAT_H +#endif /* FFMPEG_SOFTFLOAT_H */ diff --git a/libavutil/tree.h b/libavutil/tree.h index be17358..146d35d 100644 --- a/libavutil/tree.h +++ b/libavutil/tree.h @@ -24,8 +24,8 @@ * @author Michael Niedermayer */ -#ifndef TREE_H -#define TREE_H +#ifndef FFMPEG_TREE_H +#define FFMPEG_TREE_H struct AVTreeNode; @@ -55,4 +55,4 @@ void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *ke void *av_tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b)); void av_tree_destroy(struct AVTreeNode *t); -#endif /* TREE_H */ +#endif /* FFMPEG_TREE_H */ diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h index 0e4b5d1..f0e875f 100644 --- a/libavutil/x86_cpu.h +++ b/libavutil/x86_cpu.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_X86CPU_H -#define AVUTIL_X86CPU_H +#ifndef FFMPEG_X86CPU_H +#define FFMPEG_X86CPU_H #ifdef ARCH_X86_64 # define REG_a "rax" @@ -65,4 +65,4 @@ # define BROKEN_RELOCATIONS 1 #endif -#endif /* AVUTIL_X86CPU_H */ +#endif /* FFMPEG_X86CPU_H */ -- cgit v1.1