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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -30,7 +30,7 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_o OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o -OBJS-ffmpeg-$(CONFIG_DXVA2) += ffmpeg_dxva2.o +OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options |