diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 16:18:02 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 16:18:02 +0200 |
| commit | dd8a4b0f8c39803b6a33f4b4bc836cfc66222370 (patch) | |
| tree | 32fb5e4b29968caef33ecd449d25288604556dfc /Makefile | |
| parent | 866a4174dba066780c7be1ebdaa0152161cdf3e0 (diff) | |
| parent | fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8 (diff) | |
| download | ffmpeg-dd8a4b0f8c39803b6a33f4b4bc836cfc66222370.tar.gz | |
Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8':
avconv: add support for Intel QSV-accelerated transcoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -35,6 +35,7 @@ ifndef CONFIG_VIDEOTOOLBOX OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_videotoolbox.o endif OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o +OBJS-ffmpeg-$(CONFIG_LIBMFX) += ffmpeg_qsv.o OBJS-ffserver += ffserver_config.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 |