Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / flacdsp.c

diff --git a/ffmpeg/libavcodec/flacdsp.c b/ffmpeg/libavcodec/flacdsp.c
index b15bc7476b2518b3bb9e01aacb701873cff64473..a83eb833b5f895f2f89d2e23792e4833408071e4 100644 (file)
--- a/ffmpeg/libavcodec/flacdsp.c
+++ b/ffmpeg/libavcodec/flacdsp.c
@@ -85,7 +85,7 @@ static void flac_lpc_32_c(int32_t *decoded, const int coeffs[32],
 
 }
 
-av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt,
+av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels,
                              int bps)
 {
     if (bps > 16) {
@@ -127,7 +127,7 @@ av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt,
     }
 
     if (ARCH_ARM)
-        ff_flacdsp_init_arm(c, fmt, bps);
+        ff_flacdsp_init_arm(c, fmt, channels, bps);
     if (ARCH_X86)
-        ff_flacdsp_init_x86(c, fmt, bps);
+        ff_flacdsp_init_x86(c, fmt, channels, bps);
 }