diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:19:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:19:50 +0200 |
| commit | 81487781e739a20deeeb5d3d232c5737e794e80f (patch) | |
| tree | 7f4d30aeb5952a74c7994cd59455e52794553680 /libavcodec/Makefile | |
| parent | 93704e09c77e991e18c8bc1f0ab7f1e03062150e (diff) | |
| parent | b3673f34149106eedc0457e2a2d4a9ef75a884d5 (diff) | |
| download | ffmpeg-81487781e739a20deeeb5d3d232c5737e794e80f.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/h264_refs: Fix compilation with -DTRACE.
Fix make checkheaders if libmfx is not available.
lavf/gif: Add an option max_gif_delay to limit the frame duration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6aa0208d4f..db0c1e30d6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -869,7 +869,7 @@ SKIPHEADERS += %_tablegen.h \ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h SKIPHEADERS-$(CONFIG_LIBUTVIDEO) += libutvideo.h -SKIPHEADERS-$(CONFIG_QSVDEC) += qsv.h qsvdec.h qsv_internal.h +SKIPHEADERS-$(CONFIG_QSV) += qsv.h qsvdec.h qsvenc.h qsv_internal.h SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h |