[FFmpeg-cvslog] avfilter/af_pan: Do not use 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:20 2014 +0200| [ce1bb4b75d52ae98d9a52ed0bb7d18d6da3e35b0] | committer: Michael Niedermayer

avfilter/af_pan: Do not use SWR_CH_MAX

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

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

 libavfilter/af_pan.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 36395e9..4ba77a7 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -50,7 +50,7 @@ typedef struct PanContext {
 
     int pure_gains;
     /* channel mapping specific */
-    int channel_map[SWR_CH_MAX];
+    int channel_map[MAX_CHANNELS];
     struct SwrContext *swr;
 } PanContext;
 
@@ -271,11 +271,11 @@ static int config_props(AVFilterLink *link)
 
     // sanity check; can't be done in query_formats since the inlink
     // channel layout is unknown at that time
-    if (link->channels > SWR_CH_MAX ||
-        pan->nb_output_channels > SWR_CH_MAX) {
+    if (link->channels > MAX_CHANNELS ||
+        pan->nb_output_channels > MAX_CHANNELS) {
         av_log(ctx, AV_LOG_ERROR,
-               "libswresample support a maximum of %d channels. "
-               "Feel free to ask for a higher limit.\n", SWR_CH_MAX);
+               "af_pan support a maximum of %d channels. "
+               "Feel free to ask for a higher limit.\n", MAX_CHANNELS);
         return AVERROR_PATCHWELCOME;
     }
 



More information about the ffmpeg-cvslog mailing list