# HG changeset patch
# User iive
# Date 1387295085 0
# Node ID 6674ab0d11be2304a9dd08d75791e8ed93873f93
# Parent  d8174c2bc03886b196ba08e984d1e3135a48e60b
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.

diff -r d8174c2bc038 -r 6674ab0d11be configure
--- 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"