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 /libavfilter/af_amerge.c | |
parent | e97a24109c629d8a65bc52b4ec5a6952a7b30284 (diff) |
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 'libavfilter/af_amerge.c')
-rw-r--r-- | libavfilter/af_amerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 77ea297cd1..fa4f9f108e 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -23,9 +23,9 @@ * Audio merging filter */ -#include "libavutil/audioconvert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libswresample/swresample.h" // only for SWR_CH_MAX #include "avfilter.h" |