---
libavutil/adler32.h | 1 +
libavutil/audio_fifo.c | 1 -
libavutil/avassert.h | 1 +
libavutil/avstring.h | 1 +
libavutil/bswap.h | 3 ++-
libavutil/channel_layout.c | 1 -
libavutil/common.h | 2 +-
libavutil/cpu.c | 3 +++
libavutil/cpu.h | 5 +++--
libavutil/crc.h | 1 +
libavutil/des.c | 3 +--
libavutil/dict.c | 1 +
libavutil/error.c | 2 +-
libavutil/eval.c | 2 --
libavutil/fifo.c | 1 +
libavutil/fifo.h | 1 +
libavutil/file.c | 9 ++++++---
libavutil/file_open.c | 9 +++++----
libavutil/frame.c | 1 +
libavutil/frame.h | 4 +---
libavutil/imgutils.c | 2 +-
libavutil/imgutils.h | 1 +
libavutil/internal.h | 1 +
libavutil/intfloat.h | 1 +
libavutil/intfloat_readwrite.c | 1 +
libavutil/intfloat_readwrite.h | 1 +
libavutil/intreadwrite.h | 1 +
libavutil/lfg.c | 2 +-
libavutil/libm.h | 1 +
libavutil/log.c | 14 +++++++-------
libavutil/log.h | 2 +-
libavutil/lzo.c | 1 -
libavutil/md5.c | 1 +
libavutil/mem.c | 12 ++++++------
libavutil/mem.h | 2 +-
libavutil/opt.c | 2 --
libavutil/opt.h | 1 -
libavutil/parseutils.c | 1 -
libavutil/pixfmt.h | 2 +-
libavutil/random_seed.c | 14 ++++++++------
libavutil/random_seed.h | 1 +
libavutil/rational.c | 2 +-
libavutil/rational.h | 1 +
libavutil/rc4.c | 2 +-
libavutil/samplefmt.c | 7 +++----
libavutil/samplefmt.h | 1 -
libavutil/sha.c | 1 -
libavutil/time.c | 12 +++++++-----
libavutil/timer.h | 6 +++---
libavutil/utils.c | 2 +-
libavutil/x86/cpu.c | 2 --
libavutil/xtea.c | 1 +
52 files changed, 84 insertions(+), 69 deletions(-)
diff --git a/libavutil/adler32.h b/libavutil/adler32.h
index a8ff6f9..02babb3 100644
--- a/libavutil/adler32.h
+++ b/libavutil/adler32.h
@@ -22,6 +22,7 @@
#define AVUTIL_ADLER32_H
#include <stdint.h>
+
#include "attributes.h"
/**
diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c
index b562537..c7e4577 100644
--- a/libavutil/audio_fifo.c
+++ b/libavutil/audio_fifo.c
@@ -24,7 +24,6 @@
* Audio FIFO
*/
-#include "avutil.h"
#include "audio_fifo.h"
#include "common.h"
#include "fifo.h"
diff --git a/libavutil/avassert.h b/libavutil/avassert.h
index b223d26..2db15df 100644
--- a/libavutil/avassert.h
+++ b/libavutil/avassert.h
@@ -28,6 +28,7 @@
#define AVUTIL_AVASSERT_H
#include <stdlib.h>
+
#include "avutil.h"
#include "log.h"
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index b7d1098..32467a9 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -22,6 +22,7 @@
#define AVUTIL_AVSTRING_H
#include <stddef.h>
+
#include "attributes.h"
/**
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 8a350e1..2f0be28 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -27,7 +27,8 @@
#define AVUTIL_BSWAP_H
#include <stdint.h>
-#include "libavutil/avconfig.h"
+
+#include "avconfig.h"
#include "attributes.h"
#ifdef HAVE_AV_CONFIG_H
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 79e398e..6fc78a0 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -24,7 +24,6 @@
*/
#include "avstring.h"
-#include "avutil.h"
#include "channel_layout.h"
#include "common.h"
diff --git a/libavutil/common.h b/libavutil/common.h
index caa6b19..8f145b5 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -36,7 +36,7 @@
#include "attributes.h"
#include "version.h"
-#include "libavutil/avconfig.h"
+#include "avconfig.h"
#if AV_HAVE_BIGENDIAN
# define AV_NE(be, le) (be)
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 8edebbc..fd6f946 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -26,9 +26,11 @@
#define _GNU_SOURCE
#include <sched.h>
#endif
+
#if HAVE_GETPROCESSAFFINITYMASK
#include <windows.h>
#endif
+
#if HAVE_SYSCTL
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
@@ -36,6 +38,7 @@
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
+
#if HAVE_SYSCONF
#include <unistd.h>
#endif
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 8f2af28..f35b0c1 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -23,9 +23,10 @@
#include "version.h"
-#define AV_CPU_FLAG_FORCE 0x80000000 /* force usage of selected flags (OR)
*/
+/* force usage of selected flags (OR) */
+#define AV_CPU_FLAG_FORCE 0x80000000
- /* lower 16 bits - CPU features */
+/* lower 16 bits - CPU features */
#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX
ext
#if FF_API_CPU_FLAG_MMX2
diff --git a/libavutil/crc.h b/libavutil/crc.h
index 0540619..893f34c 100644
--- a/libavutil/crc.h
+++ b/libavutil/crc.h
@@ -23,6 +23,7 @@
#include <stdint.h>
#include <stddef.h>
+
#include "attributes.h"
typedef uint32_t AVCRC;
diff --git a/libavutil/des.c b/libavutil/des.c
index ab0fc2f..3de2d67 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -18,8 +18,7 @@
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <inttypes.h>
-#include "avutil.h"
+
#include "common.h"
#include "intreadwrite.h"
#include "des.h"
diff --git a/libavutil/dict.c b/libavutil/dict.c
index 9ac4831..c1e450d 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -24,6 +24,7 @@
#include "dict.h"
#include "internal.h"
#include "mem.h"
+#include "error.h"
struct AVDictionary {
int count;
diff --git a/libavutil/error.c b/libavutil/error.c
index 6803d2d..644774f 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avutil.h"
#include "avstring.h"
#include "common.h"
+#include "error.h"
int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
{
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 48f8e66..99cf814 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -27,11 +27,9 @@
*/
#include "attributes.h"
-#include "avutil.h"
#include "common.h"
#include "eval.h"
#include "log.h"
-#include "mathematics.h"
#include "avstring.h"
typedef struct Parser {
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index dffaf54..d540155 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -19,6 +19,7 @@
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#include "common.h"
#include "fifo.h"
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index ea30f5d..024087f 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -25,6 +25,7 @@
#define AVUTIL_FIFO_H
#include <stdint.h>
+
#include "avutil.h"
#include "attributes.h"
diff --git a/libavutil/file.c b/libavutil/file.c
index d2765b8..2dfe9de 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -16,19 +16,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <fcntl.h>
+#include <sys/stat.h>
+
#include "config.h"
#include "file.h"
#include "internal.h"
#include "log.h"
-#include "mem.h"
-#include <fcntl.h>
-#include <sys/stat.h>
+
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+
#if HAVE_IO_H
#include <io.h>
#endif
+
#if HAVE_MMAP
#include <sys/mman.h>
#elif HAVE_MAPVIEWOFFILE
diff --git a/libavutil/file_open.c b/libavutil/file_open.c
index 765eb60..fc38d25 100644
--- a/libavutil/file_open.c
+++ b/libavutil/file_open.c
@@ -16,15 +16,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
-#include "internal.h"
-#include "mem.h"
#include <stdarg.h>
#include <fcntl.h>
-#include <sys/stat.h>
+
+#include "config.h"
+#include "internal.h"
+
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+
#if HAVE_IO_H
#include <io.h>
#endif
diff --git a/libavutil/frame.c b/libavutil/frame.c
index 098bbed..65e8caa 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -25,6 +25,7 @@
#include "imgutils.h"
#include "mem.h"
#include "samplefmt.h"
+#include "pixfmt.h"
static void get_frame_defaults(AVFrame *frame)
{
diff --git a/libavutil/frame.h b/libavutil/frame.h
index d71948d..abca0c5 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -22,13 +22,11 @@
#include <stdint.h>
-#include "libavcodec/version.h"
-
#include "avutil.h"
#include "buffer.h"
#include "dict.h"
#include "rational.h"
-#include "samplefmt.h"
+#include "version.h"
enum AVFrameSideDataType {
/**
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index a8b4d2a..ab9cc68 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -23,9 +23,9 @@
#include "common.h"
#include "imgutils.h"
-#include "internal.h"
#include "log.h"
#include "pixdesc.h"
+#include "pixfmt.h"
void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
const AVPixFmtDescriptor *pixdesc)
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h
index 7151013..15692f5 100644
--- a/libavutil/imgutils.h
+++ b/libavutil/imgutils.h
@@ -28,6 +28,7 @@
*/
#include "avutil.h"
+
#include "pixdesc.h"
/**
diff --git a/libavutil/internal.h b/libavutil/internal.h
index b18860f..ccc5552 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -34,6 +34,7 @@
#include <stdint.h>
#include <stddef.h>
#include <assert.h>
+
#include "config.h"
#include "attributes.h"
#include "timer.h"
diff --git a/libavutil/intfloat.h b/libavutil/intfloat.h
index 38d26ad..cce8699 100644
--- a/libavutil/intfloat.h
+++ b/libavutil/intfloat.h
@@ -22,6 +22,7 @@
#define AVUTIL_INTFLOAT_H
#include <stdint.h>
+
#include "attributes.h"
union av_intfloat32 {
diff --git a/libavutil/intfloat_readwrite.c b/libavutil/intfloat_readwrite.c
index 6838563..2a24061 100644
--- a/libavutil/intfloat_readwrite.c
+++ b/libavutil/intfloat_readwrite.c
@@ -26,6 +26,7 @@
*/
#include <stdint.h>
+
#include "mathematics.h"
#include "intfloat_readwrite.h"
diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h
index f093b92..965d0e8 100644
--- a/libavutil/intfloat_readwrite.h
+++ b/libavutil/intfloat_readwrite.h
@@ -22,6 +22,7 @@
#define AVUTIL_INTFLOAT_READWRITE_H
#include <stdint.h>
+
#include "attributes.h"
/* IEEE 80 bits extended float */
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index f77fd60..bd480ac 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -20,6 +20,7 @@
#define AVUTIL_INTREADWRITE_H
#include <stdint.h>
+
#include "libavutil/avconfig.h"
#include "attributes.h"
#include "bswap.h"
diff --git a/libavutil/lfg.c b/libavutil/lfg.c
index 4221e62..9f6d9a5 100644
--- a/libavutil/lfg.c
+++ b/libavutil/lfg.c
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <inttypes.h>
#include <limits.h>
#include <math.h>
+
#include "lfg.h"
#include "md5.h"
#include "intreadwrite.h"
diff --git a/libavutil/libm.h b/libavutil/libm.h
index d6c2cf8..01e8dc9 100644
--- a/libavutil/libm.h
+++ b/libavutil/libm.h
@@ -25,6 +25,7 @@
#define AVUTIL_LIBM_H
#include <math.h>
+
#include "config.h"
#include "attributes.h"
#include "intfloat.h"
diff --git a/libavutil/log.c b/libavutil/log.c
index 7d574f6..4a48e20 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -24,21 +24,21 @@
* logging functions
*/
+#include <stdarg.h>
+#include <stdlib.h>
+
#include "config.h"
+#include "avstring.h"
+#include "common.h"
+#include "log.h"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+
#if HAVE_IO_H
#include <io.h>
#endif
-#include <stdarg.h>
-#include <stdlib.h>
-#include "avstring.h"
-#include "avutil.h"
-#include "common.h"
-#include "internal.h"
-#include "log.h"
static int av_log_level = AV_LOG_INFO;
static int flags;
diff --git a/libavutil/log.h b/libavutil/log.h
index 7b17330..141f9a3 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -22,7 +22,7 @@
#define AVUTIL_LOG_H
#include <stdarg.h>
-#include "avutil.h"
+
#include "attributes.h"
/**
diff --git a/libavutil/lzo.c b/libavutil/lzo.c
index 5c5ebc8..44357a5 100644
--- a/libavutil/lzo.c
+++ b/libavutil/lzo.c
@@ -21,7 +21,6 @@
#include <string.h>
-#include "avutil.h"
#include "common.h"
#include "intreadwrite.h"
#include "lzo.h"
diff --git a/libavutil/md5.c b/libavutil/md5.c
index efb993e..488646b 100644
--- a/libavutil/md5.c
+++ b/libavutil/md5.c
@@ -31,6 +31,7 @@
*/
#include <stdint.h>
+
#include "bswap.h"
#include "intreadwrite.h"
#include "md5.h"
diff --git a/libavutil/mem.c b/libavutil/mem.c
index 172180e..b78859c 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -24,19 +24,19 @@
* default memory allocator for libavutil
*/
-#include "config.h"
-
#include <limits.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#include "avutil.h"
+#include "config.h"
#include "intreadwrite.h"
#include "mem.h"
+#include "error.h"
+
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
#ifdef MALLOC_PREFIX
diff --git a/libavutil/mem.h b/libavutil/mem.h
index f51682b..cbf7a9f 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -28,9 +28,9 @@
#include <limits.h>
#include <stdint.h>
+#include <stdlib.h>
#include "attributes.h"
-#include "avutil.h"
/**
* @addtogroup lavu_mem
diff --git a/libavutil/opt.c b/libavutil/opt.c
index cba5b29..6675d97 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -25,14 +25,12 @@
* @author Michael Niedermayer <michae...@gmx.at>
*/
-#include "avutil.h"
#include "avstring.h"
#include "common.h"
#include "opt.h"
#include "eval.h"
#include "dict.h"
#include "log.h"
-#include "mathematics.h"
const AVOption *av_opt_next(void *obj, const AVOption *last)
{
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 0181379..fbedb75 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -28,7 +28,6 @@
*/
#include "rational.h"
-#include "avutil.h"
#include "dict.h"
#include "log.h"
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 0e3fd9e..98ccdca 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -24,7 +24,6 @@
#include <time.h>
#include "avstring.h"
-#include "avutil.h"
#include "common.h"
#include "eval.h"
#include "log.h"
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 4b04944..172534c 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -27,7 +27,7 @@
*
*/
-#include "libavutil/avconfig.h"
+#include "avconfig.h"
#include "version.h"
/**
diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index 4680081..7ee28ee 100644
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -18,21 +18,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <fcntl.h>
+#include <math.h>
+#include <time.h>
+
#include "config.h"
+#include "internal.h"
+#include "timer.h"
+#include "random_seed.h"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+
#if HAVE_CRYPTGENRANDOM
#include <windows.h>
#include <wincrypt.h>
#endif
-#include <fcntl.h>
-#include <math.h>
-#include <time.h>
-#include "internal.h"
-#include "timer.h"
-#include "random_seed.h"
static int read_random(uint32_t *dst, const char *file)
{
diff --git a/libavutil/random_seed.h b/libavutil/random_seed.h
index b1fad13..ec8be73 100644
--- a/libavutil/random_seed.h
+++ b/libavutil/random_seed.h
@@ -22,6 +22,7 @@
#define AVUTIL_RANDOM_SEED_H
#include <stdint.h>
+
/**
* @addtogroup lavu_crypto
* @{
diff --git a/libavutil/rational.c b/libavutil/rational.c
index 4053936..e8edd1d 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -25,12 +25,12 @@
* @author Michael Niedermayer <michae...@gmx.at>
*/
-#include "avassert.h"
#include <limits.h>
#include "common.h"
#include "mathematics.h"
#include "rational.h"
+#include "avassert.h"
int av_reduce(int *dst_num, int *dst_den,
int64_t num, int64_t den, int64_t max)
diff --git a/libavutil/rational.h b/libavutil/rational.h
index 5d7dab7..15ff12d 100644
--- a/libavutil/rational.h
+++ b/libavutil/rational.h
@@ -30,6 +30,7 @@
#include <stdint.h>
#include <limits.h>
+
#include "attributes.h"
/**
diff --git a/libavutil/rc4.c b/libavutil/rc4.c
index 3bf710f..1d74856 100644
--- a/libavutil/rc4.c
+++ b/libavutil/rc4.c
@@ -20,7 +20,7 @@
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avutil.h"
+
#include "common.h"
#include "rc4.h"
diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index 389f726..5a9c673 100644
--- a/libavutil/samplefmt.c
+++ b/libavutil/samplefmt.c
@@ -16,13 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "common.h"
-#include "samplefmt.h"
-
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
+#include "common.h"
+#include "samplefmt.h"
+
typedef struct SampleFmtInfo {
const char *name;
int bits;
diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h
index 33cbded..d07cf03 100644
--- a/libavutil/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -21,7 +21,6 @@
#include <stdint.h>
-#include "avutil.h"
#include "attributes.h"
/**
diff --git a/libavutil/sha.c b/libavutil/sha.c
index 2d9b58c..3f79d5e 100644
--- a/libavutil/sha.c
+++ b/libavutil/sha.c
@@ -24,7 +24,6 @@
#include <string.h>
#include "attributes.h"
-#include "avutil.h"
#include "bswap.h"
#include "sha.h"
#include "intreadwrite.h"
diff --git a/libavutil/time.c b/libavutil/time.c
index 62cd445..9294ca5 100644
--- a/libavutil/time.c
+++ b/libavutil/time.c
@@ -16,24 +16,26 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
-
#include <stddef.h>
#include <stdint.h>
#include <time.h>
+
+#include "time.h"
+#include "error.h"
+#include "config.h"
+
#if HAVE_GETTIMEOFDAY
#include <sys/time.h>
#endif
+
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+
#if HAVE_WINDOWS_H
#include <windows.h>
#endif
-#include "time.h"
-#include "error.h"
-
int64_t av_gettime(void)
{
#if HAVE_GETTIMEOFDAY
diff --git a/libavutil/timer.h b/libavutil/timer.h
index ea5c891..43eaf8e 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -18,14 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef AVUTIL_TIMER_H
+#define AVUTIL_TIMER_H
+
/**
* @file
* high precision timer, useful to profile code
*/
-#ifndef AVUTIL_TIMER_H
-#define AVUTIL_TIMER_H
-
#include <stdlib.h>
#include <stdint.h>
#include <inttypes.h>
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 9b18c97..2bb27de 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -17,7 +17,7 @@
*/
#include "config.h"
-#include "avutil.h"
+#include "version.h"
/**
* @file
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 3e946b8..cb5dfa7 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -20,10 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdlib.h>
#include <string.h>
-#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h"
diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index d1efebf..b974edb 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -26,6 +26,7 @@
#include "intreadwrite.h"
#include "xtea.h"
+
void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])
{
int i;
--
1.7.9.5
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
