diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 01:32:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 01:47:53 +0200 |
| commit | 21c7e99659bea1ed735caa83399a5777957a8e16 (patch) | |
| tree | bbd48ff5d66fa33e75aea9580aa881a09f25966d /ffmpeg_opt.c | |
| parent | c6eee3120a594cf25feb892f952a409a512d182e (diff) | |
| parent | a61c2115fb936d50b8b0328d00562fe529a7c46a (diff) | |
| download | ffmpeg-21c7e99659bea1ed735caa83399a5777957a8e16.tar.gz | |
Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
configure: rework dxva in avconv handling
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 25968f4f6a..000c788032 100644 --- 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 }, |