diff options
author | wm4 <wm4@nowhere> | 2013-07-30 16:21:33 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-30 16:21:33 +0200 |
commit | a8153f59d5ef292bcd6806a35417e3d67c323ebf (patch) | |
tree | a4b02b234ad7d8ebd2ffef24da13109e172f48dd /configure | |
parent | 103fbf043f7e26709ad0e6212cefefdac985e089 (diff) | |
download | mpv-a8153f59d5ef292bcd6806a35417e3d67c323ebf.tar.bz2 mpv-a8153f59d5ef292bcd6806a35417e3d67c323ebf.tar.xz |
configure: fix vdpau test if vdpau is disabled/unavailable
The check for HAVE_AV_CODEC_NEW_VDPAU_API just determines whether the
new vdpau libavutil pixel format is available (which implies presence of
the new API). However, that pixel format (and the correspondig config
test define) is also used in generic code (compiled even without vdpau)
in fmt-conversion.c. Since the configure test didn't define the symbol
if vdpau was not available, it broke in this case.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -2635,22 +2635,25 @@ else def_avresample_has_set_channel_mapping='#define HAVE_AVRESAMPLE_SET_CHANNEL_MAPPING 0' fi -_vdpau_dec=no -_vdpau_dec_old=no -if test "$_vdpau" = yes ; then echocheck "libavcodec new vdpau API" _avcodec_new_vdpau_api=no statement_check libavutil/pixfmt.h 'int x = AV_PIX_FMT_VDPAU' && _avcodec_new_vdpau_api=yes if test "$_avcodec_new_vdpau_api" = yes ; then def_avcodec_new_vdpau_api='#define HAVE_AV_CODEC_NEW_VDPAU_API 1' - _vdpau_dec=yes else def_avcodec_new_vdpau_api='#define HAVE_AV_CODEC_NEW_VDPAU_API 0' - _vdpau_dec_old=yes fi echores "$_avcodec_new_vdpau_api" +_vdpau_dec=no +_vdpau_dec_old=no +if test "$_vdpau" = yes ; then + if test "$_avcodec_new_vdpau_api" = yes ; then + _vdpau_dec=yes + else + _vdpau_dec_old=yes + fi fi echocheck "libavcodec AV_CODEC_PROP_TEXT_SUB API" |