Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-10 03:07:56 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-08-10 03:08:46 +0400
commit36bce999f5e775b7b8f207d71f2af48a994f6bb4 (patch)
treec727f0745ff9fb8304c8b8b0445bfcc5910531d8 /libavfilter/af_amerge.c
parentce1bb4b75d52ae98d9a52ed0bb7d18d6da3e35b0 (diff)
libavfilter/af_amerge: Do not depend on SWR_CH_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
-rw-r--r--libavfilter/af_amerge.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 591d672c48..0a0a79fd29 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -27,12 +27,13 @@
#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"
#include "audio.h"
#include "bufferqueue.h"
#include "internal.h"
+#define SWR_CH_MAX 32
+
typedef struct {
const AVClass *class;
int nb_inputs;