# HG changeset patch
# User diego
# Date 1192613866 0
# Node ID d0f3bb6e367ead3d52e9e32615e136cf21638b1b
# Parent  997894c973e2e53df97195131a9cd313fce36788
Add FFMPEG_ prefix to all multiple inclusion guards.

diff -r 997894c973e2 -r d0f3bb6e367e adler32.h
--- a/adler32.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/adler32.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
 unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
                                 unsigned int len);
 
-#endif
+#endif /* FFMPEG_ADLER32_H */
diff -r 997894c973e2 -r d0f3bb6e367e aes.h
--- a/aes.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/aes.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
@@ -44,4 +44,4 @@
  */
 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 -r 997894c973e2 -r d0f3bb6e367e avstring.h
--- a/avstring.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/avstring.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stddef.h>
 
@@ -87,4 +87,4 @@
  */
 size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...);
 
-#endif /* AVUTIL_AVSTRING_H */
+#endif /* FFMPEG_AVSTRING_H */
diff -r 997894c973e2 -r d0f3bb6e367e avutil.h
--- a/avutil.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/avutil.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 #define PIX_FMT_YUV422  PIX_FMT_YUYV422
 #endif
 
-#endif /* AVUTIL_H */
+#endif /* FFMPEG_AVUTIL_H */
diff -r 997894c973e2 -r d0f3bb6e367e base64.h
--- a/base64.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/base64.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
@@ -37,4 +37,4 @@
  */
 char *av_base64_encode(char * buf, int buf_len, uint8_t * src, int len);
 
-#endif // AVUTIL_BASE64_H
+#endif /* FFMPEG_BASE64_H */
diff -r 997894c973e2 -r d0f3bb6e367e bswap.h
--- a/bswap.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/bswap.h	Wed Oct 17 09:37:46 2007 +0000
@@ -23,8 +23,8 @@
  * byte swap.
  */
 
-#ifndef BSWAP_H
-#define BSWAP_H
+#ifndef FFMPEG_BSWAP_H
+#define FFMPEG_BSWAP_H
 
 #include <stdint.h>
 #include "common.h"
@@ -138,4 +138,4 @@
 #define le2me_64(x) (x)
 #endif
 
-#endif /* BSWAP_H */
+#endif /* FFMPEG_BSWAP_H */
diff -r 997894c973e2 -r d0f3bb6e367e common.h
--- a/common.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/common.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <inttypes.h>
 
@@ -366,4 +366,4 @@
 #define STOP_TIMER(id) {}
 #endif
 
-#endif /* COMMON_H */
+#endif /* FFMPEG_COMMON_H */
diff -r 997894c973e2 -r d0f3bb6e367e crc.h
--- a/crc.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/crc.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 #include <sys/types.h>
@@ -48,5 +48,5 @@
 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 -r 997894c973e2 -r d0f3bb6e367e fifo.h
--- a/fifo.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/fifo.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
@@ -99,4 +99,4 @@
         ptr -= f->end - f->buffer;
     return *ptr;
 }
-#endif /* FIFO_H */
+#endif /* FFMPEG_FIFO_H */
diff -r 997894c973e2 -r d0f3bb6e367e integer.h
--- a/integer.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/integer.h	Wed Oct 17 09:37:46 2007 +0000
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef INTEGER_H
-#define INTEGER_H
+#ifndef FFMPEG_INTEGER_H
+#define FFMPEG_INTEGER_H
 
 #include <stdint.h>
 
@@ -80,4 +80,4 @@
  */
 int64_t av_i2int(AVInteger a);
 
-#endif // INTEGER_H
+#endif /* FFMPEG_INTEGER_H */
diff -r 997894c973e2 -r d0f3bb6e367e internal.h
--- a/internal.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/internal.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 }
 #endif /* HAVE_LRINTF */
 
-#endif /* INTERNAL_H */
+#endif /* FFMPEG_INTERNAL_H */
diff -r 997894c973e2 -r d0f3bb6e367e intfloat_readwrite.h
--- a/intfloat_readwrite.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/intfloat_readwrite.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 int32_t av_flt2int(float d);
 AVExtFloat av_dbl2ext(double d);
 
-#endif /* INTFLOAT_READWRITE_H */
+#endif /* FFMPEG_INTFLOAT_READWRITE_H */
diff -r 997894c973e2 -r d0f3bb6e367e intreadwrite.h
--- a/intreadwrite.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/intreadwrite.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 #include "bswap.h"
@@ -186,4 +186,4 @@
                     ((uint8_t*)(p))[7] = (d)>>56; } while(0)
 #endif
 
-#endif /* INTREADWRITE_H */
+#endif /* FFMPEG_INTREADWRITE_H */
diff -r 997894c973e2 -r d0f3bb6e367e lls.h
--- a/lls.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/lls.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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_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 -r 997894c973e2 -r d0f3bb6e367e log.h
--- a/log.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/log.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdarg.h>
 
@@ -113,4 +113,4 @@
 extern void (*av_vlog)(void*, int, const char*, va_list);
 #endif
 
-#endif /* LOG_H */
+#endif /* FFMPEG_LOG_H */
diff -r 997894c973e2 -r d0f3bb6e367e lzo.h
--- a/lzo.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/lzo.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 -r 997894c973e2 -r d0f3bb6e367e mathematics.h
--- a/mathematics.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/mathematics.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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_q(int64_t a, AVRational bq, AVRational cq);
 
-#endif /* MATHEMATICS_H */
+#endif /* FFMPEG_MATHEMATICS_H */
diff -r 997894c973e2 -r d0f3bb6e367e md5.h
--- a/md5.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/md5.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
@@ -32,5 +32,5 @@
 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 -r 997894c973e2 -r d0f3bb6e367e mem.h
--- a/mem.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/mem.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
  */
 void av_freep(void *ptr);
 
-#endif /* AV_MEM_H */
+#endif /* FFMPEG_MEM_H */
diff -r 997894c973e2 -r d0f3bb6e367e random.h
--- a/random.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/random.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 
 // only available if DEBUG is defined in the .c file
 void av_benchmark_random(void);
-#endif // AV_RANDOM_H
 
+#endif /* FFMPEG_RANDOM_H */
diff -r 997894c973e2 -r d0f3bb6e367e rational.h
--- a/rational.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rational.h	Wed Oct 17 09:37:46 2007 +0000
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef RATIONAL_H
-#define RATIONAL_H
+#ifndef FFMPEG_RATIONAL_H
+#define FFMPEG_RATIONAL_H
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@
  */
 AVRational av_d2q(double d, int max);
 
-#endif // RATIONAL_H
+#endif /* FFMPEG_RATIONAL_H */
diff -r 997894c973e2 -r d0f3bb6e367e rc4.h
--- a/rc4.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rc4.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 -r 997894c973e2 -r d0f3bb6e367e sha1.h
--- a/sha1.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/sha1.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
@@ -30,4 +30,5 @@
 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 -r 997894c973e2 -r d0f3bb6e367e softfloat.h
--- a/softfloat.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/softfloat.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 <stdint.h>
 
@@ -125,4 +125,4 @@
     else           return v.mant >>(-v.exp);
 }
 
-#endif // AVUTIL_SOFTFLOAT_H
+#endif /* FFMPEG_SOFTFLOAT_H */
diff -r 997894c973e2 -r d0f3bb6e367e tree.h
--- a/tree.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/tree.h	Wed Oct 17 09:37:46 2007 +0000
@@ -24,8 +24,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef TREE_H
-#define TREE_H
+#ifndef FFMPEG_TREE_H
+#define FFMPEG_TREE_H
 
 struct AVTreeNode;
 
@@ -55,4 +55,4 @@
 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 -r 997894c973e2 -r d0f3bb6e367e x86_cpu.h
--- a/x86_cpu.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/x86_cpu.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 */