Mercurial > mplayer.hg
changeset 36451:6674ab0d11be
Allow the compilation of more than one hwaccel format.
The configure variable that contains the hwaccel defines from FFmpeg
is overwritten at successful detection. This way FFmpeg would contain
only the hwaccel of the last detected system.
| author | iive |
|---|---|
| date | Tue, 17 Dec 2013 15:44:45 +0000 |
| parents | d8174c2bc038 |
| children | ead03d1b8ea2 |
| files | configure |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Dec 16 00:06:28 2013 +0000 +++ b/configure Tue Dec 17 15:44:45 2013 +0000 @@ -4588,7 +4588,7 @@ if test "$_vda" = yes ; then def_vda='#define CONFIG_VDA 1' extra_ldflags="$extra_ldflags -framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore" - libavhwaccels="H264_VDA_HWACCEL" + libavhwaccels="$libavhwaccels H264_VDA_HWACCEL" else def_vda='#define CONFIG_VDA 0' libavdecoders=$(filter_out_component decoder '[A-Z0-9]*_VDA') @@ -4607,7 +4607,7 @@ def_vdpau='#define CONFIG_VDPAU 1' libs_mplayer="$libs_mplayer -lvdpau" vomodules="vdpau $vomodules" - libavhwaccels="H263_VDPAU_HWACCEL H264_VDPAU_HWACCEL MPEG1_VDPAU_HWACCEL MPEG2_VDPAU_HWACCEL MPEG4_VDPAU_HWACCEL VC1_VDPAU_HWACCEL WMV3_VDPAU_HWACCEL" + libavhwaccels="$libavhwaccels H263_VDPAU_HWACCEL H264_VDPAU_HWACCEL MPEG1_VDPAU_HWACCEL MPEG2_VDPAU_HWACCEL MPEG4_VDPAU_HWACCEL VC1_VDPAU_HWACCEL WMV3_VDPAU_HWACCEL" else def_vdpau='#define CONFIG_VDPAU 0' novomodules="vdpau $novomodules"