OSDN Git Service

lavfi/silencedetect: unbreak for unknown channel layouts
authorPaul B Mahol <onemda@gmail.com>
Sat, 13 Jul 2013 22:22:12 +0000 (22:22 +0000)
committerPaul B Mahol <onemda@gmail.com>
Sat, 13 Jul 2013 22:23:09 +0000 (22:23 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/af_silencedetect.c

index eb4718b..0ae3c24 100644 (file)
@@ -25,7 +25,6 @@
 
 #include <float.h> /* DBL_MAX */
 
-#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
 #include "audio.h"
@@ -64,7 +63,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
 {
     int i;
     SilenceDetectContext *silence = inlink->dst->priv;
-    const int nb_channels           = av_get_channel_layout_nb_channels(inlink->channel_layout);
+    const int nb_channels           = inlink->channels;
     const int srate                 = inlink->sample_rate;
     const int nb_samples            = insamples->nb_samples     * nb_channels;
     const int64_t nb_samples_notify = srate * silence->duration * nb_channels;