diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-31 11:39:47 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-31 11:39:47 +0400 |
commit | 987903826b0dba2e134be200ac94be66b4a3acf1 (patch) | |
tree | 3be692b87242d02bddeb5dbf4bac0621ff11c156 /libavutil | |
parent | f0319383436e1abc3fc1464fe4e5f4dc40db3419 (diff) |
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
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/adler32.h | 6 | ||||
-rw-r--r-- | libavutil/aes.h | 6 | ||||
-rw-r--r-- | libavutil/avstring.h | 6 | ||||
-rw-r--r-- | libavutil/avutil.h | 6 | ||||
-rw-r--r-- | libavutil/base64.h | 6 | ||||
-rw-r--r-- | libavutil/bswap.h | 6 | ||||
-rw-r--r-- | libavutil/common.h | 6 | ||||
-rw-r--r-- | libavutil/crc.h | 6 | ||||
-rw-r--r-- | libavutil/crc_data.h | 6 | ||||
-rw-r--r-- | libavutil/des.h | 6 | ||||
-rw-r--r-- | libavutil/fifo.h | 6 | ||||
-rw-r--r-- | libavutil/integer.h | 6 | ||||
-rw-r--r-- | libavutil/internal.h | 6 | ||||
-rw-r--r-- | libavutil/intfloat_readwrite.h | 6 | ||||
-rw-r--r-- | libavutil/intreadwrite.h | 6 | ||||
-rw-r--r-- | libavutil/lfg.h | 6 | ||||
-rw-r--r-- | libavutil/lls.h | 6 | ||||
-rw-r--r-- | libavutil/log.h | 6 | ||||
-rw-r--r-- | libavutil/lzo.h | 6 | ||||
-rw-r--r-- | libavutil/mathematics.h | 6 | ||||
-rw-r--r-- | libavutil/md5.h | 6 | ||||
-rw-r--r-- | libavutil/mem.h | 6 | ||||
-rw-r--r-- | libavutil/pca.h | 6 | ||||
-rw-r--r-- | libavutil/random.h | 6 | ||||
-rw-r--r-- | libavutil/rational.h | 6 | ||||
-rw-r--r-- | libavutil/rc4.h | 6 | ||||
-rw-r--r-- | libavutil/sha1.h | 6 | ||||
-rw-r--r-- | libavutil/softfloat.h | 6 | ||||
-rw-r--r-- | libavutil/tree.h | 6 | ||||
-rw-r--r-- | libavutil/x86_cpu.h | 6 |
30 files changed, 90 insertions, 90 deletions
diff --git a/libavutil/adler32.h b/libavutil/adler32.h index 488669daa9..34f2b53e7d 100644 --- a/libavutil/adler32.h +++ b/libavutil/adler32.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ADLER32_H -#define FFMPEG_ADLER32_H +#ifndef AVUTIL_ADLER32_H +#define AVUTIL_ADLER32_H #include <stdint.h> #include "common.h" @@ -27,4 +27,4 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len) av_pure; -#endif /* FFMPEG_ADLER32_H */ +#endif /* AVUTIL_ADLER32_H */ diff --git a/libavutil/aes.h b/libavutil/aes.h index 25efdf4d64..c7a4aa0335 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 FFMPEG_AES_H -#define FFMPEG_AES_H +#ifndef AVUTIL_AES_H +#define AVUTIL_AES_H #include <stdint.h> @@ -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 /* FFMPEG_AES_H */ +#endif /* AVUTIL_AES_H */ diff --git a/libavutil/avstring.h b/libavutil/avstring.h index ecac9e6230..954174555c 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 FFMPEG_AVSTRING_H -#define FFMPEG_AVSTRING_H +#ifndef AVUTIL_AVSTRING_H +#define AVUTIL_AVSTRING_H #include <stddef.h> @@ -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 /* FFMPEG_AVSTRING_H */ +#endif /* AVUTIL_AVSTRING_H */ diff --git a/libavutil/avutil.h b/libavutil/avutil.h index cefc710de8..62b50550c4 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 FFMPEG_AVUTIL_H -#define FFMPEG_AVUTIL_H +#ifndef AVUTIL_AVUTIL_H +#define AVUTIL_AVUTIL_H /** * @file avutil.h @@ -144,4 +144,4 @@ enum PixelFormat { #define PIX_FMT_YUV422 PIX_FMT_YUYV422 #endif -#endif /* FFMPEG_AVUTIL_H */ +#endif /* AVUTIL_AVUTIL_H */ diff --git a/libavutil/base64.h b/libavutil/base64.h index e95e4ea3e3..91df541d59 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 FFMPEG_BASE64_H -#define FFMPEG_BASE64_H +#ifndef AVUTIL_BASE64_H +#define AVUTIL_BASE64_H #include <stdint.h> @@ -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, const uint8_t * src, int len); -#endif /* FFMPEG_BASE64_H */ +#endif /* AVUTIL_BASE64_H */ diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 2f1e768abe..86a2492a20 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -23,8 +23,8 @@ * byte swapping routines */ -#ifndef FFMPEG_BSWAP_H -#define FFMPEG_BSWAP_H +#ifndef AVUTIL_BSWAP_H +#define AVUTIL_BSWAP_H #include <stdint.h> #include "config.h" @@ -129,4 +129,4 @@ static inline uint64_t av_const bswap_64(uint64_t x) #define le2me_64(x) (x) #endif -#endif /* FFMPEG_BSWAP_H */ +#endif /* AVUTIL_BSWAP_H */ diff --git a/libavutil/common.h b/libavutil/common.h index 696b03e78b..42fe9515d5 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -23,8 +23,8 @@ * common internal and external API header */ -#ifndef FFMPEG_COMMON_H -#define FFMPEG_COMMON_H +#ifndef AVUTIL_COMMON_H +#define AVUTIL_COMMON_H #include <inttypes.h> @@ -412,4 +412,4 @@ tend= AV_READ_TIME();\ # define NULL_IF_CONFIG_SMALL(x) x #endif -#endif /* FFMPEG_COMMON_H */ +#endif /* AVUTIL_COMMON_H */ diff --git a/libavutil/crc.h b/libavutil/crc.h index 5ebb2f5469..e07e65a5dc 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 FFMPEG_CRC_H -#define FFMPEG_CRC_H +#ifndef AVUTIL_CRC_H +#define AVUTIL_CRC_H #include <stdint.h> #include <stddef.h> @@ -40,5 +40,5 @@ int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size); const AVCRC *av_crc_get_table(AVCRCId crc_id); uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure; -#endif /* FFMPEG_CRC_H */ +#endif /* AVUTIL_CRC_H */ diff --git a/libavutil/crc_data.h b/libavutil/crc_data.h index 857678dd6f..afa25e7cfc 100644 --- a/libavutil/crc_data.h +++ b/libavutil/crc_data.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_CRC_DATA_H -#define FFMPEG_CRC_DATA_H +#ifndef AVUTIL_CRC_DATA_H +#define AVUTIL_CRC_DATA_H #include "crc.h" @@ -210,4 +210,4 @@ static const AVCRC av_crc_table[AV_CRC_MAX][257] = { }, }; -#endif /* FFMPEG_CRC_DATA_H */ +#endif /* AVUTIL_CRC_DATA_H */ diff --git a/libavutil/des.h b/libavutil/des.h index 40d8aa18ef..88240594ee 100644 --- a/libavutil/des.h +++ b/libavutil/des.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DES_H -#define FFMPEG_DES_H +#ifndef AVUTIL_DES_H +#define AVUTIL_DES_H #include <stdint.h> #include "common.h" @@ -37,4 +37,4 @@ */ uint64_t ff_des_encdec(uint64_t in, uint64_t key, int decrypt) av_const; -#endif /* FFMPEG_DES_H */ +#endif /* AVUTIL_DES_H */ diff --git a/libavutil/fifo.h b/libavutil/fifo.h index f35ccc348a..37338ca673 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -21,8 +21,8 @@ * A very simple circular buffer FIFO implementation. */ -#ifndef FFMPEG_FIFO_H -#define FFMPEG_FIFO_H +#ifndef AVUTIL_FIFO_H +#define AVUTIL_FIFO_H #include <stdint.h> #include "common.h" @@ -125,4 +125,4 @@ static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs) ptr -= f->end - f->buffer; return *ptr; } -#endif /* FFMPEG_FIFO_H */ +#endif /* AVUTIL_FIFO_H */ diff --git a/libavutil/integer.h b/libavutil/integer.h index b38d5caa32..6c5c274141 100644 --- a/libavutil/integer.h +++ b/libavutil/integer.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_INTEGER_H -#define FFMPEG_INTEGER_H +#ifndef AVUTIL_INTEGER_H +#define AVUTIL_INTEGER_H #include <stdint.h> #include "common.h" @@ -81,4 +81,4 @@ AVInteger av_int2i(int64_t a) av_const; */ int64_t av_i2int(AVInteger a) av_const; -#endif /* FFMPEG_INTEGER_H */ +#endif /* AVUTIL_INTEGER_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 798c55b87a..7d55ac658d 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -23,8 +23,8 @@ * common internal api header. */ -#ifndef FFMPEG_INTERNAL_H -#define FFMPEG_INTERNAL_H +#ifndef AVUTIL_INTERNAL_H +#define AVUTIL_INTERNAL_H #if !defined(DEBUG) && !defined(NDEBUG) # define NDEBUG @@ -297,4 +297,4 @@ static av_always_inline av_const float roundf(float x) } #endif /* HAVE_ROUNDF */ -#endif /* FFMPEG_INTERNAL_H */ +#endif /* AVUTIL_INTERNAL_H */ diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h index 4b3f9b7bcf..e2d5d5be0e 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 FFMPEG_INTFLOAT_READWRITE_H -#define FFMPEG_INTFLOAT_READWRITE_H +#ifndef AVUTIL_INTFLOAT_READWRITE_H +#define AVUTIL_INTFLOAT_READWRITE_H #include <stdint.h> #include "common.h" @@ -37,4 +37,4 @@ int64_t av_dbl2int(double d) av_const; int32_t av_flt2int(float d) av_const; AVExtFloat av_dbl2ext(double d) av_const; -#endif /* FFMPEG_INTFLOAT_READWRITE_H */ +#endif /* AVUTIL_INTFLOAT_READWRITE_H */ diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 72ad5b3af3..535fdd2dfe 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 FFMPEG_INTREADWRITE_H -#define FFMPEG_INTREADWRITE_H +#ifndef AVUTIL_INTREADWRITE_H +#define AVUTIL_INTREADWRITE_H #include <stdint.h> #include "config.h" @@ -189,4 +189,4 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed)); ((uint8_t*)(p))[1] = (d)>>8; \ ((uint8_t*)(p))[2] = (d)>>16; } while(0) -#endif /* FFMPEG_INTREADWRITE_H */ +#endif /* AVUTIL_INTREADWRITE_H */ diff --git a/libavutil/lfg.h b/libavutil/lfg.h index 36f94e64b1..f75491e353 100644 --- a/libavutil/lfg.h +++ b/libavutil/lfg.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LFG_H -#define FFMPEG_LFG_H +#ifndef AVUTIL_LFG_H +#define AVUTIL_LFG_H typedef struct { unsigned int state[64]; @@ -51,4 +51,4 @@ static inline unsigned int av_mlfg_get(AVLFG *c){ return c->state[c->index++ & 63] = 2*a*b+a+b; } -#endif //FFMPEG_LFG_H +#endif /* AVUTIL_LFG_H */ diff --git a/libavutil/lls.h b/libavutil/lls.h index 90b2332aa9..d168e59749 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 FFMPEG_LLS_H -#define FFMPEG_LLS_H +#ifndef AVUTIL_LLS_H +#define AVUTIL_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 /* FFMPEG_LLS_H */ +#endif /* AVUTIL_LLS_H */ diff --git a/libavutil/log.h b/libavutil/log.h index e0ff1f6fff..152e773c2c 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 FFMPEG_LOG_H -#define FFMPEG_LOG_H +#ifndef AVUTIL_LOG_H +#define AVUTIL_LOG_H #include <stdarg.h> @@ -126,4 +126,4 @@ void av_log_set_level(int); void av_log_set_callback(void (*)(void*, int, const char*, va_list)); void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); -#endif /* FFMPEG_LOG_H */ +#endif /* AVUTIL_LOG_H */ diff --git a/libavutil/lzo.h b/libavutil/lzo.h index 183f9595ac..2f09f9f217 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 FFMPEG_LZO_H -#define FFMPEG_LZO_H +#ifndef AVUTIL_LZO_H +#define AVUTIL_LZO_H #include <stdint.h> @@ -36,4 +36,4 @@ int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen); void av_memcpy_backptr(uint8_t *dst, int back, int cnt); -#endif /* FFMPEG_LZO_H */ +#endif /* AVUTIL_LZO_H */ diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h index 79d3f76ab6..74385274b3 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 FFMPEG_MATHEMATICS_H -#define FFMPEG_MATHEMATICS_H +#ifndef AVUTIL_MATHEMATICS_H +#define AVUTIL_MATHEMATICS_H #include <stdint.h> #include <math.h> @@ -66,4 +66,4 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_cons */ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const; -#endif /* FFMPEG_MATHEMATICS_H */ +#endif /* AVUTIL_MATHEMATICS_H */ diff --git a/libavutil/md5.h b/libavutil/md5.h index 7d63df01b3..969202a807 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 FFMPEG_MD5_H -#define FFMPEG_MD5_H +#ifndef AVUTIL_MD5_H +#define AVUTIL_MD5_H #include <stdint.h> @@ -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 /* FFMPEG_MD5_H */ +#endif /* AVUTIL_MD5_H */ diff --git a/libavutil/mem.h b/libavutil/mem.h index 84d647d8ea..149889b5fa 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -23,8 +23,8 @@ * Memory handling functions. */ -#ifndef FFMPEG_MEM_H -#define FFMPEG_MEM_H +#ifndef AVUTIL_MEM_H +#define AVUTIL_MEM_H #ifdef __ICC #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n))) @@ -116,4 +116,4 @@ char *av_strdup(const char *s) av_malloc_attrib; */ void av_freep(void *ptr); -#endif /* FFMPEG_MEM_H */ +#endif /* AVUTIL_MEM_H */ diff --git a/libavutil/pca.h b/libavutil/pca.h index c1a3d640f5..651e902780 100644 --- a/libavutil/pca.h +++ b/libavutil/pca.h @@ -24,12 +24,12 @@ * Principal component analysis */ -#ifndef FFMPEG_PCA_H -#define FFMPEG_PCA_H +#ifndef AVUTIL_PCA_H +#define AVUTIL_PCA_H struct PCA *ff_pca_init(int n); void ff_pca_free(struct PCA *pca); void ff_pca_add(struct PCA *pca, double *v); int ff_pca(struct PCA *pca, double *eigenvector, double *eigenvalue); -#endif /* FFMPEG_PCA_H */ +#endif /* AVUTIL_PCA_H */ diff --git a/libavutil/random.h b/libavutil/random.h index 86e4f64e67..f243676e7c 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 FFMPEG_RANDOM_H -#define FFMPEG_RANDOM_H +#ifndef AVUTIL_RANDOM_H +#define AVUTIL_RANDOM_H #define AV_RANDOM_N 624 @@ -70,4 +70,4 @@ static inline double av_random_real1(AVRandomState *state) return av_random(state) * (1.0 / 4294967296.0); } -#endif /* FFMPEG_RANDOM_H */ +#endif /* AVUTIL_RANDOM_H */ diff --git a/libavutil/rational.h b/libavutil/rational.h index 2f0017c868..5957eee859 100644 --- a/libavutil/rational.h +++ b/libavutil/rational.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_RATIONAL_H -#define FFMPEG_RATIONAL_H +#ifndef AVUTIL_RATIONAL_H +#define AVUTIL_RATIONAL_H #include <stdint.h> #include "common.h" @@ -113,4 +113,4 @@ AVRational av_sub_q(AVRational b, AVRational c) av_const; */ AVRational av_d2q(double d, int max) av_const; -#endif /* FFMPEG_RATIONAL_H */ +#endif /* AVUTIL_RATIONAL_H */ diff --git a/libavutil/rc4.h b/libavutil/rc4.h index 882fa23b8a..a39dea9cf3 100644 --- a/libavutil/rc4.h +++ b/libavutil/rc4.h @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RC4_H -#define FFMPEG_RC4_H +#ifndef AVUTIL_RC4_H +#define AVUTIL_RC4_H #include <stdint.h> void ff_rc4_enc(const uint8_t *key, int keylen, uint8_t *data, int datalen); -#endif /* FFMPEG_RC4_H */ +#endif /* AVUTIL_RC4_H */ diff --git a/libavutil/sha1.h b/libavutil/sha1.h index fc5bf08251..0f14ca8960 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 FFMPEG_SHA1_H -#define FFMPEG_SHA1_H +#ifndef AVUTIL_SHA1_H +#define AVUTIL_SHA1_H #include <stdint.h> @@ -31,4 +31,4 @@ void av_sha1_init(struct AVSHA1* context); void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len); void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]); -#endif /* FFMPEG_SHA1_H */ +#endif /* AVUTIL_SHA1_H */ diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index 283cc6e69a..e0bf1e75e3 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 FFMPEG_SOFTFLOAT_H -#define FFMPEG_SOFTFLOAT_H +#ifndef AVUTIL_SOFTFLOAT_H +#define AVUTIL_SOFTFLOAT_H #include <stdint.h> #include "common.h" @@ -126,4 +126,4 @@ static inline av_const int av_sf2int(SoftFloat v, int frac_bits){ else return v.mant >>(-v.exp); } -#endif /* FFMPEG_SOFTFLOAT_H */ +#endif /* AVUTIL_SOFTFLOAT_H */ diff --git a/libavutil/tree.h b/libavutil/tree.h index 111ea81a04..c457234b09 100644 --- a/libavutil/tree.h +++ b/libavutil/tree.h @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_TREE_H -#define FFMPEG_TREE_H +#ifndef AVUTIL_TREE_H +#define AVUTIL_TREE_H struct AVTreeNode; extern const int av_tree_node_size; @@ -79,4 +79,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), struct AVTreeNode **next); void av_tree_destroy(struct AVTreeNode *t); -#endif /* FFMPEG_TREE_H */ +#endif /* AVUTIL_TREE_H */ diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h index a60b0b56a8..fb0c85784e 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 FFMPEG_X86CPU_H -#define FFMPEG_X86CPU_H +#ifndef AVUTIL_X86_CPU_H +#define AVUTIL_X86_CPU_H #include <stdint.h> #include "config.h" @@ -76,4 +76,4 @@ typedef int32_t x86_reg; # define BROKEN_RELOCATIONS 1 #endif -#endif /* FFMPEG_X86CPU_H */ +#endif /* AVUTIL_X86_CPU_H */ |