Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:32:04 +02:00
parent c6eee3120a a61c2115fb
commit 21c7e99659
3 changed files with 9 additions and 6 deletions
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -67,7 +67,7 @@ const HWAccel hwaccels[] = {
 #if HAVE_VDPAU_X11
    { "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU },
 #endif
-#if CONFIG_DXVA2
+#if HAVE_DXVA2_LIB
    { "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD },
 #endif
    { 0 },