diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-11-13 13:16:48 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-11-13 13:21:21 +0000 |
| commit | 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e (patch) | |
| tree | 6269ef27e201fd8cd8646f565565976e224a6337 /libswresample | |
| parent | e97a24109c629d8a65bc52b4ec5a6952a7b30284 (diff) | |
| download | ffmpeg-1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e.tar.gz | |
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/audioconvert.h | 1 | ||||
| -rw-r--r-- | libswresample/rematrix.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample-test.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h index 9a234d4b93..d8af003671 100644 --- a/libswresample/audioconvert.h +++ b/libswresample/audioconvert.h @@ -31,7 +31,6 @@ #include "swresample_internal.h" #include "libavutil/cpu.h" -#include "libavutil/audioconvert.h" typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 3115c99dde..e23c45e852 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -19,8 +19,8 @@ */ #include "swresample_internal.h" -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #define ONE (1.0) #define R(x) x diff --git a/libswresample/swresample-test.c b/libswresample/swresample-test.c index a0dfe28908..7f50cb48d0 100644 --- a/libswresample/swresample-test.c +++ b/libswresample/swresample-test.c @@ -20,8 +20,8 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" -#include "libavutil/audioconvert.h" #include "libavutil/opt.h" #include "swresample.h" diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 4564d440c9..041d2b2319 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -22,7 +22,7 @@ #include "swresample_internal.h" #include "audioconvert.h" #include "libavutil/avassert.h" -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include <float.h> diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 38b18d9d7e..459b1b0868 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -22,7 +22,7 @@ #define SWR_INTERNAL_H #include "swresample.h" -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "config.h" #define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */ |