[FFmpeg-cvslog] libavfilter/af_amerge: Do not depend on SWR_CH_MAX

Michael Niedermayer git at videolan.org
Sun Aug 10 01:19:09 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 01:07:56 2014 +0200| [36bce999f5e775b7b8f207d71f2af48a994f6bb4] | committer: Michael Niedermayer

libavfilter/af_amerge: Do not depend on SWR_CH_MAX

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36bce999f5e775b7b8f207d71f2af48a994f6bb4
---

 libavfilter/af_amerge.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 591d672..0a0a79f 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;



More information about the ffmpeg-cvslog mailing list