libavutil-dev version 1.0.8 support, requires we conditionalize the avutil/channel_layout.h include

This commit is contained in:
Adam Di Carlo 2014-03-15 14:27:33 -04:00
parent 4aff572ed7
commit 67ad7b9c1f
2 changed files with 5 additions and 0 deletions

View File

@ -183,6 +183,9 @@ if [ "$HAVE_THREADS" != 'no' ]; then
check_pkgconf AVCODEC libavcodec 54
check_pkgconf AVFORMAT libavformat 54
check_pkgconf AVUTIL libavutil 51
if [ "$HAVE_AVUTIL" = 'yes' ]; then
check_header AVUTIL_CHANNEL_LAYOUT libavutil/channel_layout.h
fi
check_pkgconf SWSCALE libswscale 2.1
( [ "$HAVE_FFMPEG" = 'auto' ] && ( [ "$HAVE_AVCODEC" = 'no' ] || [ "$HAVE_AVFORMAT" = 'no' ] || [ "$HAVE_AVUTIL" = 'no' ] || [ "$HAVE_SWSCALE" = 'no' ] ) && HAVE_FFMPEG='no' ) || HAVE_FFMPEG='yes'
fi

View File

@ -27,7 +27,9 @@ extern "C" {
#include <libavformat/avformat.h>
#include <libavutil/avconfig.h>
#include <libavutil/pixdesc.h>
#ifdef AVUTIL_CHANNEL_LAYOUT
#include <libavutil/channel_layout.h>
#endif
#include <libswscale/swscale.h>
#ifdef __cplusplus
}