[FFmpeg-cvslog] lavfi/silencedetect: unbreak for unknown channel layouts

Paul B Mahol git at videolan.org
Sun Jul 14 00:25:06 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Jul 13 22:22:12 2013 +0000| [f486d7e924ff684039181d8f0f37a360b846e379] | committer: Paul B Mahol

lavfi/silencedetect: unbreak for unknown channel layouts

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavfilter/af_silencedetect.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
index eb4718b..0ae3c24 100644
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@@ -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;



More information about the ffmpeg-cvslog mailing list