diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 03:06:58 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 03:22:22 +0400 |
| commit | c6eee3120a594cf25feb892f952a409a512d182e (patch) | |
| tree | dfadf4547a680823f6805011d1bcf6077a9ce121 /Makefile | |
| parent | 9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96 (diff) | |
| parent | 35177ba77ff60a8b8839783f57e44bcc4214507a (diff) | |
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -30,6 +30,8 @@ $(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 + TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher uncoded_frame |