diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2018-02-26 01:20:51 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2018-02-27 16:22:12 +0100 |
| commit | 27cbbbb33f259de7c795d2b75edf7b240f0f82e6 (patch) | |
| tree | 4ea8517b48c0dac803d515c5c279113521243bf3 /configure | |
| parent | 7414d0bda7763f9bd69c26c068e482ab297c1c96 (diff) | |
| download | ffmpeg-27cbbbb33f259de7c795d2b75edf7b240f0f82e6.tar.gz | |
compat: remove in-tree NVidia headers
External headers are no longer welcome in the ffmpeg codebase because they
increase the maintenance burden. However, in the NVidia case the vanilla
headers need some modifications to be usable in ffmpeg therefore we still
provide them, but in a separate repository.
The external headers can be found at
https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git
Fate-source is updated because of the deleted files, and dynlink_loader.h
license headers were updated with the standard FFmpeg headers.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -5811,6 +5811,9 @@ check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "vdpau/vdpau.h" "VdpPictureInfoHEVC" +check_pkg_config cuda "ffnvcodec >= 8.0.14.1" \ + "ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h" "" + check_cpp_condition windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" && enable winrt || disable winrt if ! disabled w32threads && ! enabled pthreads; then @@ -6263,7 +6266,7 @@ fi enabled nvenc && check_cc -I$source_path <<EOF || disable nvenc -#include "compat/nvenc/nvEncodeAPI.h" +#include <ffnvcodec/nvEncodeAPI.h> NV_ENCODE_API_FUNCTION_LIST flist; void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; } int main(void) { return 0; } |