From 63e8d9760f23a4edf81e9ae58c4f6d3baa6ff4dd Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 21 Nov 2010 20:06:22 +0000 Subject: Use the new libavcore audio channel API. This also allows to remove a linking dependency of libavfilter on libavcodec. Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/defaults.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter/defaults.c') diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 388d12c15e..c7b4b47246 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcore/audioconvert.h" #include "libavcore/imgutils.h" #include "libavcore/samplefmt.h" -#include "libavcodec/audioconvert.h" #include "avfilter.h" /* TODO: buffer pool. see comment for avfilter_default_get_video_buffer() */ @@ -111,7 +111,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per samples->free = avfilter_default_free_buffer; sample_size = av_get_bits_per_sample_fmt(sample_fmt) >>3; - chans_nb = avcodec_channel_layout_num_channels(channel_layout); + chans_nb = av_get_channel_layout_nb_channels(channel_layout); per_channel_size = size/chans_nb; ref->audio->samples_nb = per_channel_size/sample_size; -- cgit v1.2.3