From 831fa0985ce4b16e5a4d830f49275aa99ac75d73 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Tue, 1 Feb 2011 22:49:13 +0200 Subject: changed: do not use our audioconvert.h with external FFmpeg Including audioconvert.h from our FFmpeg may cause other files from the bundled FFmpeg to be included. Replace that by declaring the functions manually. --- lib/DllAvCodec.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lib/DllAvCodec.h') diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index 7b59fdb18b..f286647004 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -54,8 +54,18 @@ extern "C" { #include #endif #endif - /* We'll just inlude this header in our project for now */ - #include "ffmpeg/libavcodec/audioconvert.h" + + /* From non-public audioconvert.h */ + int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); + struct AVAudioConvert; + typedef struct AVAudioConvert AVAudioConvert; + AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, + enum AVSampleFormat in_fmt, int in_channels, + const float *matrix, int flags); + void av_audio_convert_free(AVAudioConvert *ctx); + int av_audio_convert(AVAudioConvert *ctx, + void * const out[6], const int out_stride[6], + const void * const in[6], const int in_stride[6], int len); #else #include "libavcodec/avcodec.h" #include "libavcodec/audioconvert.h" -- cgit v1.2.3