vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Aug 31 08:18:08 2015 +0200| [cdf35ce011abed346d898da1dcd0bae6bebd14ef] | committer: Jean-Baptiste Kempf
avcodec: fix avutil55 audioconvert compilation > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cdf35ce011abed346d898da1dcd0bae6bebd14ef --- modules/codec/avcodec/audio.c | 3 ++- modules/codec/avcodec/avcommon_compat.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c index bfb1c8d..b50adf8 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -36,12 +36,13 @@ #include <vlc_codec.h> #include <vlc_avcodec.h> +#include "avcodec.h" + #include <libavcodec/avcodec.h> #include <libavutil/mem.h> #include <libavutil/audioconvert.h> -#include "avcodec.h" /***************************************************************************** * decoder_sys_t : decoder descriptor diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h index b179b3e..5c2ffbc 100644 --- a/modules/codec/avcodec/avcommon_compat.h +++ b/modules/codec/avcodec/avcommon_compat.h @@ -75,6 +75,10 @@ static inline void avcodec_free_context( AVCodecContext **ctx ) #endif /* HAVE_LIBAVUTIL_AVUTIL_H */ +#if LIBAVUTIL_VERSION_MAJOR >= 55 +# define FF_API_AUDIOCONVERT 1 +#endif + /* libavutil/pixfmt.h */ #ifndef PixelFormat # define PixelFormat AVPixelFormat _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
