---
libavresample/audio_convert.c | 8 ++++----
libavresample/audio_convert.h | 4 +---
libavresample/audio_data.c | 3 ++-
libavresample/audio_data.h | 5 +++--
libavresample/audio_mix.c | 6 +++---
libavresample/audio_mix.h | 2 --
libavresample/audio_mix_matrix.c | 8 ++------
libavresample/avresample-test.c | 3 ++-
libavresample/avresample.h | 5 +++--
libavresample/dither.c | 7 ++++---
libavresample/internal.h | 3 ++-
libavresample/options.c | 7 ++++---
libavresample/resample.c | 6 +++---
libavresample/resample.h | 1 -
libavresample/utils.c | 13 ++++++-------
15 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index 371617c..e7c48a9 100644
--- a/libavresample/audio_convert.c
+++ b/libavresample/audio_convert.c
@@ -22,14 +22,14 @@
#include <stdint.h>
#include "config.h"
+#include "audio_convert.h"
+#include "audio_data.h"
+#include "dither.h"
+
#include "libavutil/common.h"
-#include "libavutil/libm.h"
#include "libavutil/log.h"
#include "libavutil/mem.h"
#include "libavutil/samplefmt.h"
-#include "audio_convert.h"
-#include "audio_data.h"
-#include "dither.h"
enum ConvFuncType {
CONV_FUNC_TYPE_FLAT,
diff --git a/libavresample/audio_convert.h b/libavresample/audio_convert.h
index 6a3089d..db78eec 100644
--- a/libavresample/audio_convert.h
+++ b/libavresample/audio_convert.h
@@ -21,10 +21,8 @@
#ifndef AVRESAMPLE_AUDIO_CONVERT_H
#define AVRESAMPLE_AUDIO_CONVERT_H
-#include "libavutil/samplefmt.h"
-#include "avresample.h"
-#include "internal.h"
#include "audio_data.h"
+#include "libavutil/samplefmt.h"
/**
* Set conversion function if the parameters match.
diff --git a/libavresample/audio_data.c b/libavresample/audio_data.c
index c52f518..17cd7fe 100644
--- a/libavresample/audio_data.c
+++ b/libavresample/audio_data.c
@@ -21,9 +21,10 @@
#include <stdint.h>
#include <string.h>
-#include "libavutil/mem.h"
#include "audio_data.h"
+#include "libavutil/mem.h"
+
static const AVClass audio_data_class = {
.class_name = "AudioData",
.item_name = av_default_item_name,
diff --git a/libavresample/audio_data.h b/libavresample/audio_data.h
index 97236bb..0420db1 100644
--- a/libavresample/audio_data.h
+++ b/libavresample/audio_data.h
@@ -23,11 +23,12 @@
#include <stdint.h>
+#include "avresample.h"
+#include "internal.h"
+
#include "libavutil/audio_fifo.h"
#include "libavutil/log.h"
#include "libavutil/samplefmt.h"
-#include "avresample.h"
-#include "internal.h"
/**
* Audio buffer used for intermediate storage between conversion phases.
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index e6f9417..a4ff3ec 100644
--- a/libavresample/audio_mix.c
+++ b/libavresample/audio_mix.c
@@ -20,14 +20,14 @@
#include <stdint.h>
-#include "libavutil/common.h"
-#include "libavutil/libm.h"
-#include "libavutil/samplefmt.h"
#include "avresample.h"
#include "internal.h"
#include "audio_data.h"
#include "audio_mix.h"
+#include "libavutil/common.h"
+#include "libavutil/samplefmt.h"
+
static const char *coeff_type_names[] = { "q8", "q15", "flt" };
struct AudioMix {
diff --git a/libavresample/audio_mix.h b/libavresample/audio_mix.h
index 5bae5ab..1d8e633 100644
--- a/libavresample/audio_mix.h
+++ b/libavresample/audio_mix.h
@@ -23,10 +23,8 @@
#include <stdint.h>
-#include "libavutil/samplefmt.h"
#include "avresample.h"
#include "internal.h"
-#include "audio_data.h"
typedef void (mix_func)(uint8_t **src, void **matrix, int len, int out_ch,
int in_ch);
diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c
index 8da1b48..bf27509 100644
--- a/libavresample/audio_mix_matrix.c
+++ b/libavresample/audio_mix_matrix.c
@@ -21,13 +21,9 @@
#include <stdint.h>
-#include "libavutil/common.h"
-#include "libavutil/libm.h"
-#include "libavutil/samplefmt.h"
#include "avresample.h"
-#include "internal.h"
-#include "audio_data.h"
-#include "audio_mix.h"
+
+#include "libavutil/common.h"
/* channel positions */
#define FRONT_LEFT 0
diff --git a/libavresample/avresample-test.c b/libavresample/avresample-test.c
index 697b4ba..6300d99 100644
--- a/libavresample/avresample-test.c
+++ b/libavresample/avresample-test.c
@@ -22,6 +22,8 @@
#include <stdint.h>
#include <stdio.h>
+#include "avresample.h"
+
#include "libavutil/avstring.h"
#include "libavutil/common.h"
#include "libavutil/lfg.h"
@@ -30,7 +32,6 @@
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/samplefmt.h"
-#include "avresample.h"
static double dbl_rand(AVLFG *lfg)
{
diff --git a/libavresample/avresample.h b/libavresample/avresample.h
index d26f2ca..6f2bf9d 100644
--- a/libavresample/avresample.h
+++ b/libavresample/avresample.h
@@ -93,13 +93,14 @@
* avresample_free().
*/
+
+#include "version.h"
+
#include "libavutil/avutil.h"
#include "libavutil/channel_layout.h"
#include "libavutil/dict.h"
#include "libavutil/log.h"
-#include "libavresample/version.h"
-
#define AVRESAMPLE_MAX_CHANNELS 32
typedef struct AVAudioResampleContext AVAudioResampleContext;
diff --git a/libavresample/dither.c b/libavresample/dither.c
index 17de829..37fe2e2 100644
--- a/libavresample/dither.c
+++ b/libavresample/dither.c
@@ -31,14 +31,15 @@
#include <math.h>
#include <stdint.h>
+#include "audio_convert.h"
+#include "dither.h"
+#include "internal.h"
+
#include "libavutil/attributes.h"
#include "libavutil/common.h"
#include "libavutil/lfg.h"
#include "libavutil/mem.h"
#include "libavutil/samplefmt.h"
-#include "audio_convert.h"
-#include "dither.h"
-#include "internal.h"
typedef struct DitherState {
int mute;
diff --git a/libavresample/internal.h b/libavresample/internal.h
index 057f89a..bc6f4c5 100644
--- a/libavresample/internal.h
+++ b/libavresample/internal.h
@@ -21,11 +21,12 @@
#ifndef AVRESAMPLE_INTERNAL_H
#define AVRESAMPLE_INTERNAL_H
+#include "avresample.h"
+
#include "libavutil/audio_fifo.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/samplefmt.h"
-#include "avresample.h"
typedef struct AudioData AudioData;
typedef struct AudioConvert AudioConvert;
diff --git a/libavresample/options.c b/libavresample/options.c
index 7859ec6..e1ffa1d 100644
--- a/libavresample/options.c
+++ b/libavresample/options.c
@@ -18,13 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/mathematics.h"
-#include "libavutil/mem.h"
-#include "libavutil/opt.h"
#include "avresample.h"
#include "internal.h"
#include "audio_mix.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+
/**
* @file
* Options definition for AVAudioResampleContext.
diff --git a/libavresample/resample.c b/libavresample/resample.c
index 69c9bab..49bab7b 100644
--- a/libavresample/resample.c
+++ b/libavresample/resample.c
@@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/common.h"
-#include "libavutil/libm.h"
-#include "libavutil/log.h"
#include "internal.h"
#include "resample.h"
#include "audio_data.h"
+#include "libavutil/common.h"
+#include "libavutil/log.h"
+
struct ResampleContext {
AVAudioResampleContext *avr;
AudioData *buffer;
diff --git a/libavresample/resample.h b/libavresample/resample.h
index 4544dab..72230dd 100644
--- a/libavresample/resample.h
+++ b/libavresample/resample.h
@@ -23,7 +23,6 @@
#include "avresample.h"
#include "internal.h"
-#include "audio_data.h"
/**
* Allocate and initialize a ResampleContext.
diff --git a/libavresample/utils.c b/libavresample/utils.c
index b79def9..78713d2 100644
--- a/libavresample/utils.c
+++ b/libavresample/utils.c
@@ -18,13 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/common.h"
-#include "libavutil/dict.h"
-#include "libavutil/error.h"
-#include "libavutil/log.h"
-#include "libavutil/mem.h"
-#include "libavutil/opt.h"
-
#include "avresample.h"
#include "internal.h"
#include "audio_data.h"
@@ -32,6 +25,12 @@
#include "audio_mix.h"
#include "resample.h"
+#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "libavutil/mem.h"
+#include "libavutil/opt.h"
+
int avresample_open(AVAudioResampleContext *avr)
{
int ret;
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
