From 49431626cb1bde400ab6de6adc68ce39cdbbf6f8 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 11 Apr 2016 14:59:33 -0400 Subject: Revert "build: disable encoding mode by default" Reverting because the use of deprecated API has been fixed. This reverts commit d0238711dc776aeee2509452202ba4748f863ee4. --- wscript | 1 - 1 file changed, 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index f4fe38ed59..6d77932681 100644 --- a/wscript +++ b/wscript @@ -325,7 +325,6 @@ iconv support use --disable-iconv.", } , { 'name' : '--encoding', 'desc' : 'Encoding', - 'default': 'disable', 'func': check_true, }, { 'name': '--libbluray', -- cgit v1.2.3 From e13cc25a2ca815f6351def8ebb6e18a89b46b6b5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 14 Apr 2016 18:20:13 +0200 Subject: build: add check for AVHWFramesContext API It's not used yet anywhere. Pushing this now so switching between branches is less bothersome. --- wscript | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 6d77932681..a4ffce6031 100644 --- a/wscript +++ b/wscript @@ -496,6 +496,12 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ 'func': check_statement('libavformat/avformat.h', '(void)offsetof(AVStream, codecpar)', use='libav'), + }, { + 'name': 'avutil-has-hwcontext', + 'desc': 'libavutil AVHWFramesContext API', + 'func': check_statement('libavutil/frame.h', + '(void)offsetof(AVFrame, hw_frames_ctx)', + use='libav'), }, ] -- cgit v1.2.3 From 622bcb0e37f39f2a542b42587ca442c6600b7414 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Sun, 1 May 2016 01:49:38 +1000 Subject: win32: replace libuuid.a usage with initguid.h Including initguid.h at the top of a file that uses references to GUIDs causes the GUIDs to be declared globally with __declspec(selectany). The 'selectany' attribute tells the linker to consolidate multiple definitions of each GUID, which would be great except that, in Cygwin and MinGW GCC 6.1, this method of linking makes the GUIDs conflict with the ones declared in libuuid.a. Since initguid.h obsoletes libuuid.a in modern compilers that support __declspec(selectany), add initguid.h to all files that use GUIDs and remove libuuid.a from the build. Fixes #3097 --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index a4ffce6031..061b14ee61 100644 --- a/wscript +++ b/wscript @@ -140,7 +140,7 @@ main_dependencies = [ 'name': 'win32', 'desc': 'win32', 'deps_any': [ 'os-win32', 'os-cygwin' ], - 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'uuid', 'avrt', 'dwmapi']), + 'func': check_cc(lib=['winmm', 'gdi32', 'ole32', 'avrt', 'dwmapi']), }, { 'name': '--win32-internal-pthreads', 'desc': 'internal pthread wrapper for win32 (Vista+)', -- cgit v1.2.3 From f54e555d27ba4e2bf2209002a8f1582cd5837f33 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 1 May 2016 20:15:53 +0200 Subject: wscript: make at least 1 OpenGL output mandatory You have to explicitly disable it if you really want to compile without it (like with libass). --- wscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 061b14ee61..d4f84e13b4 100644 --- a/wscript +++ b/wscript @@ -816,7 +816,11 @@ video_output_features = [ 'desc': 'OpenGL video outputs', 'deps_any': [ 'gl-cocoa', 'gl-x11', 'egl-x11', 'egl-drm', 'gl-win32', 'gl-wayland', 'rpi', 'plain-gl' ], - 'func': check_true + 'func': check_true, + 'req': True, + 'fmsg': "Unable to find OpenGL header files for video output. " + + "Aborting. If you really mean to compile without OpenGL " + + "video outputs use --disable-gl." }, { 'name': 'egl-helpers', 'desc': 'EGL helper functions', -- cgit v1.2.3 From fde20d10bcacebf61aff42ab1f48ac72023a2aa5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 11 May 2016 12:33:49 +0200 Subject: vo_opengl: angle: dynamically load ANGLE ANGLE is _really_ annoying to build. (Requires special toolchain and a recent MSVC version.) This results in various issues with people having trouble to build mpv against ANGLE (apparently linking it against a prebuilt binary doesn't count, or using binaries from potentially untrusted sources is not wanted). Dynamically loading ANGLE is going to be a huge convenience. This commit implements this, with special focus on keeping it source compatible to a normal build with ANGLE linked at build-time. --- wscript | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index d4f84e13b4..0a031aac81 100644 --- a/wscript +++ b/wscript @@ -699,9 +699,8 @@ video_output_features = [ 'desc': 'OpenGL Win32 ANGLE Backend', 'deps_any': [ 'os-win32', 'os-cygwin' ], 'groups': [ 'gl' ], - 'func': check_statement(['EGL/egl.h'], - 'eglCreateWindowSurface(0, 0, 0, 0)', - lib='EGL') + 'func': check_statement(['EGL/egl.h', 'EGL/eglext.h'], + 'int x = EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE') } , { 'name': '--vdpau', 'desc': 'VDPAU acceleration', -- cgit v1.2.3 From fd82e14888ae2fb1a7430e1166a048dc03321d49 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 11 May 2016 14:37:03 +0200 Subject: build: merge d3d11va and dxva2 hwaccel checks We don't have any reason to disable either. Both are loaded dynamically at runtime anyway. There is also no reason why dxva2 would disappear from libavcodec any time soon. --- wscript | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 0a031aac81..6ff38d6a0c 100644 --- a/wscript +++ b/wscript @@ -856,20 +856,12 @@ hwaccel_features = [ 'av_vdpau_bind_context(0,0,0,AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH)', use='libav'), }, { - 'name': '--dxva2-hwaccel', - 'desc': 'libavcodec DXVA2 hwaccel', + 'name': '--d3d-hwaccel', + 'desc': 'libavcodec DXVA2 and D3D11VA hwaccel', 'deps': [ 'win32' ], - 'func': check_headers('libavcodec/dxva2.h', use='libav'), - }, { - 'name': '--d3d11va-hwaccel', - 'desc': 'libavcodec D3D11VA hwaccel', - 'deps': [ 'win32' ], - 'func': check_headers('libavcodec/d3d11va.h', use='libav'), - }, { - 'name': 'd3d-hwaccel', - 'desc': 'Direct3D hwaccel', - 'deps_any': [ 'dxva2-hwaccel', 'd3d11va-hwaccel' ], - 'func': check_true + 'func': compose_checks( + check_headers('libavcodec/dxva2.h', use='libav'), + check_headers('libavcodec/d3d11va.h', use='libav')), }, { 'name': 'sse4-intrinsics', 'desc': 'GCC SSE4 intrinsics for GPU memcpy', -- cgit v1.2.3 From b6c40953cbb640d8ec9e3fa9862e243c0dbb1d17 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Mon, 16 May 2016 13:58:14 +0200 Subject: csputils: add AVCOL_TRC_SMPTEST2084 support This now lets us auto-detect appropriately tagged HDR content using FFmpeg's new TRC entries (when available). Hidden behind an #if because Libav stable doesn't have it yet. --- wscript | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 6ff38d6a0c..684fdf0465 100644 --- a/wscript +++ b/wscript @@ -502,7 +502,13 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ 'func': check_statement('libavutil/frame.h', '(void)offsetof(AVFrame, hw_frames_ctx)', use='libav'), - }, + }, { + 'name': 'avutil-st2084', + 'desc': 'libavutil AVCOL_TRC_SMPTEST2084', + 'func': check_statement('libavutil/pixfmt.h', + 'AVCOL_TRC_SMPTEST2084', + use='libav'), + } ] audio_output_features = [ -- cgit v1.2.3 From f0d743741235fcf4f73610c45c2684268d744183 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Fri, 20 May 2016 10:56:23 +0200 Subject: build: Do not link to libGL for egl-drm Signed-off-by: Quentin Glidic --- wscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 684fdf0465..aae6fa175e 100644 --- a/wscript +++ b/wscript @@ -677,7 +677,10 @@ video_output_features = [ 'desc': 'OpenGL DRM EGL Backend', 'deps': [ 'drm', 'gbm' ], 'groups': [ 'gl' ], - 'func': check_pkg_config('egl', 'gl'), + 'func': compose_checks( + check_pkg_config('egl'), + check_pkg_config_cflags('gl') + ) } , { 'name': '--gl-wayland', 'desc': 'OpenGL Wayland Backend', -- cgit v1.2.3 From b51957fab59fd5a2fde824e1946befd29ed172c1 Mon Sep 17 00:00:00 2001 From: Martin Herkt Date: Thu, 9 Jun 2016 01:34:18 +0200 Subject: wscript: Require recent FFmpeg by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Distros and users alike should be made aware of the fact that old FFmpeg versions are bad. When users come to us with FFmpeg-related trouble, the answer is “update FFmpeg” more often than not (and no further support will be provided until they have done so), so instead we just nag them about it here. --- wscript | 69 ++++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 24 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index aae6fa175e..4b510f0c99 100644 --- a/wscript +++ b/wscript @@ -389,6 +389,14 @@ iconv support use --disable-iconv.", } ] +ffmpeg_pkg_config_checks = [ + 'libavutil', '>= 55.17.103', + 'libavcodec', '>= 57.24.102', + 'libavformat', '>= 57.25.100', + 'libswscale', '>= 4.0.100' +] +ffmpeg_versions_string = "FFmpeg 3.0.2" + libav_pkg_config_checks = [ 'libavutil', '>= 54.02.0', 'libavcodec', '>= 56.1.0', @@ -397,14 +405,27 @@ libav_pkg_config_checks = [ ] libav_versions_string = "FFmpeg 2.4 or Libav 11" -libav_dependencies = [ +ffmpeg_dependencies = [ { - 'name': 'libav', - 'desc': 'libav/ffmpeg', + 'name': 'recent-ffmpeg', + 'desc': 'recent ffmpeg', + 'func': check_pkg_config(*ffmpeg_pkg_config_checks), + }, { + 'name': '--unsupported-ffmpeg', + 'desc': 'old libav/ffmpeg', 'func': check_pkg_config(*libav_pkg_config_checks), + 'default': 'disable', + }, { + 'name': 'ffmpeg', + 'desc': 'ffmpeg', + 'deps_any': [ 'recent-ffmpeg', 'unsupported-ffmpeg' ], + 'func': check_true, 'req': True, 'fmsg': "Unable to find development files for some of the required \ -FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string) +FFmpeg/Libav libraries. Only {0} or newer is supported.\nIf you wish to build \ +mpv with older versions (at least {1}), use --enable-unsupported-ffmpeg.\n\ +This is NOT SUPPORTED, and some player features will not work correctly. \ +Aborting.".format(ffmpeg_versions_string, libav_versions_string), }, { 'name': '--libswresample', 'desc': 'libswresample', @@ -435,79 +456,79 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ 'desc': 'libavcodec avcodec_enum_to_chroma_pos API', 'func': check_statement('libavcodec/avcodec.h', """int x, y; avcodec_enum_to_chroma_pos(&x, &y, AVCHROMA_LOC_UNSPECIFIED)""", - use='libav') + use='ffmpeg') }, { 'name': 'avframe-metadata', 'desc': 'libavutil AVFrame metadata', 'func': check_statement('libavutil/frame.h', 'av_frame_get_metadata(NULL)', - use='libav') + use='ffmpeg') }, { 'name': 'avframe-skip-samples', 'desc': 'libavutil AVFrame skip samples metadata', 'func': check_statement('libavutil/frame.h', 'enum AVFrameSideDataType type = AV_FRAME_DATA_SKIP_SAMPLES', - use='libav') + use='ffmpeg') }, { 'name': 'av-pix-fmt-mmal', 'desc': 'libavutil AV_PIX_FMT_MMAL', 'func': check_statement('libavutil/pixfmt.h', 'int x = AV_PIX_FMT_MMAL', - use='libav'), + use='ffmpeg'), }, { 'name': 'av-version-info', 'desc': 'libavtuil av_version_info()', 'func': check_statement('libavutil/avutil.h', 'const char *x = av_version_info()', - use='libav'), + use='ffmpeg'), }, { 'name': 'av-new-pixdesc', 'desc': 'libavutil new pixdesc fields', 'func': check_statement('libavutil/pixdesc.h', 'AVComponentDescriptor d; int x = d.depth', - use='libav'), + use='ffmpeg'), }, { 'name': 'av-avpacket-int64-duration', 'desc': 'libavcodec 64 bit AVPacket.duration', 'func': check_statement('libavcodec/avcodec.h', 'int x[(int)sizeof(((AVPacket){0}).duration) - 7]', - use='libav'), + use='ffmpeg'), }, { 'name': 'av-subtitle-nopict', 'desc': 'libavcodec AVSubtitleRect AVPicture removal', 'func': check_statement('libavcodec/avcodec.h', 'AVSubtitleRect r = {.linesize={0}}', - use='libav'), + use='ffmpeg'), }, { 'name': 'avcodec-profile-name', 'desc': 'libavcodec avcodec_profile_name()', 'func': check_statement('libavcodec/avcodec.h', 'avcodec_profile_name(0,0)', - use='libav'), + use='ffmpeg'), }, { 'name': 'avcodec-new-codec-api', 'desc': 'libavcodec decode/encode API', 'func': check_statement('libavcodec/avcodec.h', 'avcodec_send_packet(0,0)', - use='libav'), + use='ffmpeg'), }, { 'name': 'avcodec-has-codecpar', 'desc': 'libavcodec AVCodecParameters API', 'func': check_statement('libavformat/avformat.h', '(void)offsetof(AVStream, codecpar)', - use='libav'), + use='ffmpeg'), }, { 'name': 'avutil-has-hwcontext', 'desc': 'libavutil AVHWFramesContext API', 'func': check_statement('libavutil/frame.h', '(void)offsetof(AVFrame, hw_frames_ctx)', - use='libav'), + use='ffmpeg'), }, { 'name': 'avutil-st2084', 'desc': 'libavutil AVCOL_TRC_SMPTEST2084', 'func': check_statement('libavutil/pixfmt.h', 'AVCOL_TRC_SMPTEST2084', - use='libav'), + use='ffmpeg'), } ] @@ -842,7 +863,7 @@ hwaccel_features = [ 'name': '--vaapi-hwaccel', 'desc': 'libavcodec VAAPI hwaccel', 'deps': [ 'vaapi' ], - 'func': check_headers('libavcodec/vaapi.h', use='libav'), + 'func': check_headers('libavcodec/vaapi.h', use='ffmpeg'), }, { 'name': '--videotoolbox-hwaccel', 'desc': 'libavcodec videotoolbox hwaccel', @@ -851,7 +872,7 @@ hwaccel_features = [ check_statement('libavcodec/videotoolbox.h', 'av_videotoolbox_alloc_context()', framework='IOSurface', - use='libav')), + use='ffmpeg')), } , { 'name': '--videotoolbox-gl', 'desc': 'Videotoolbox with OpenGL', @@ -863,14 +884,14 @@ hwaccel_features = [ 'deps': [ 'vdpau' ], 'func': check_statement('libavcodec/vdpau.h', 'av_vdpau_bind_context(0,0,0,AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH)', - use='libav'), + use='ffmpeg'), }, { 'name': '--d3d-hwaccel', 'desc': 'libavcodec DXVA2 and D3D11VA hwaccel', 'deps': [ 'win32' ], 'func': compose_checks( - check_headers('libavcodec/dxva2.h', use='libav'), - check_headers('libavcodec/d3d11va.h', use='libav')), + check_headers('libavcodec/dxva2.h', use='ffmpeg'), + check_headers('libavcodec/d3d11va.h', use='ffmpeg')), }, { 'name': 'sse4-intrinsics', 'desc': 'GCC SSE4 intrinsics for GPU memcpy', @@ -964,7 +985,7 @@ def options(opt): help = 'variant name for saving configuration and build results') opt.parse_features('build and install options', build_options) - optional_features = main_dependencies + libav_dependencies + optional_features = main_dependencies + ffmpeg_dependencies opt.parse_features('optional features', optional_features) opt.parse_features('audio outputs', audio_output_features) opt.parse_features('video outputs', video_output_features) @@ -1025,7 +1046,7 @@ def configure(ctx): ctx.parse_dependencies(main_dependencies) ctx.parse_dependencies(audio_output_features) ctx.parse_dependencies(video_output_features) - ctx.parse_dependencies(libav_dependencies) + ctx.parse_dependencies(ffmpeg_dependencies) ctx.parse_dependencies(hwaccel_features) ctx.parse_dependencies(radio_and_tv_features) -- cgit v1.2.3 From 1c5fd2d9019d84901e2c0c5485c79e7d79fa5662 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 9 Jun 2016 21:05:33 +0200 Subject: Revert "wscript: Require recent FFmpeg by default" This reverts commit b51957fab59fd5a2fde824e1946befd29ed172c1. Breaks big time. It appears to ignore explicitly configured paths within the libav* .pc files, which for example breaks mpv-build. --- wscript | 69 +++++++++++++++++++++++------------------------------------------ 1 file changed, 24 insertions(+), 45 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 4b510f0c99..aae6fa175e 100644 --- a/wscript +++ b/wscript @@ -389,14 +389,6 @@ iconv support use --disable-iconv.", } ] -ffmpeg_pkg_config_checks = [ - 'libavutil', '>= 55.17.103', - 'libavcodec', '>= 57.24.102', - 'libavformat', '>= 57.25.100', - 'libswscale', '>= 4.0.100' -] -ffmpeg_versions_string = "FFmpeg 3.0.2" - libav_pkg_config_checks = [ 'libavutil', '>= 54.02.0', 'libavcodec', '>= 56.1.0', @@ -405,27 +397,14 @@ libav_pkg_config_checks = [ ] libav_versions_string = "FFmpeg 2.4 or Libav 11" -ffmpeg_dependencies = [ +libav_dependencies = [ { - 'name': 'recent-ffmpeg', - 'desc': 'recent ffmpeg', - 'func': check_pkg_config(*ffmpeg_pkg_config_checks), - }, { - 'name': '--unsupported-ffmpeg', - 'desc': 'old libav/ffmpeg', + 'name': 'libav', + 'desc': 'libav/ffmpeg', 'func': check_pkg_config(*libav_pkg_config_checks), - 'default': 'disable', - }, { - 'name': 'ffmpeg', - 'desc': 'ffmpeg', - 'deps_any': [ 'recent-ffmpeg', 'unsupported-ffmpeg' ], - 'func': check_true, 'req': True, 'fmsg': "Unable to find development files for some of the required \ -FFmpeg/Libav libraries. Only {0} or newer is supported.\nIf you wish to build \ -mpv with older versions (at least {1}), use --enable-unsupported-ffmpeg.\n\ -This is NOT SUPPORTED, and some player features will not work correctly. \ -Aborting.".format(ffmpeg_versions_string, libav_versions_string), +FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_string) }, { 'name': '--libswresample', 'desc': 'libswresample', @@ -456,79 +435,79 @@ Aborting.".format(ffmpeg_versions_string, libav_versions_string), 'desc': 'libavcodec avcodec_enum_to_chroma_pos API', 'func': check_statement('libavcodec/avcodec.h', """int x, y; avcodec_enum_to_chroma_pos(&x, &y, AVCHROMA_LOC_UNSPECIFIED)""", - use='ffmpeg') + use='libav') }, { 'name': 'avframe-metadata', 'desc': 'libavutil AVFrame metadata', 'func': check_statement('libavutil/frame.h', 'av_frame_get_metadata(NULL)', - use='ffmpeg') + use='libav') }, { 'name': 'avframe-skip-samples', 'desc': 'libavutil AVFrame skip samples metadata', 'func': check_statement('libavutil/frame.h', 'enum AVFrameSideDataType type = AV_FRAME_DATA_SKIP_SAMPLES', - use='ffmpeg') + use='libav') }, { 'name': 'av-pix-fmt-mmal', 'desc': 'libavutil AV_PIX_FMT_MMAL', 'func': check_statement('libavutil/pixfmt.h', 'int x = AV_PIX_FMT_MMAL', - use='ffmpeg'), + use='libav'), }, { 'name': 'av-version-info', 'desc': 'libavtuil av_version_info()', 'func': check_statement('libavutil/avutil.h', 'const char *x = av_version_info()', - use='ffmpeg'), + use='libav'), }, { 'name': 'av-new-pixdesc', 'desc': 'libavutil new pixdesc fields', 'func': check_statement('libavutil/pixdesc.h', 'AVComponentDescriptor d; int x = d.depth', - use='ffmpeg'), + use='libav'), }, { 'name': 'av-avpacket-int64-duration', 'desc': 'libavcodec 64 bit AVPacket.duration', 'func': check_statement('libavcodec/avcodec.h', 'int x[(int)sizeof(((AVPacket){0}).duration) - 7]', - use='ffmpeg'), + use='libav'), }, { 'name': 'av-subtitle-nopict', 'desc': 'libavcodec AVSubtitleRect AVPicture removal', 'func': check_statement('libavcodec/avcodec.h', 'AVSubtitleRect r = {.linesize={0}}', - use='ffmpeg'), + use='libav'), }, { 'name': 'avcodec-profile-name', 'desc': 'libavcodec avcodec_profile_name()', 'func': check_statement('libavcodec/avcodec.h', 'avcodec_profile_name(0,0)', - use='ffmpeg'), + use='libav'), }, { 'name': 'avcodec-new-codec-api', 'desc': 'libavcodec decode/encode API', 'func': check_statement('libavcodec/avcodec.h', 'avcodec_send_packet(0,0)', - use='ffmpeg'), + use='libav'), }, { 'name': 'avcodec-has-codecpar', 'desc': 'libavcodec AVCodecParameters API', 'func': check_statement('libavformat/avformat.h', '(void)offsetof(AVStream, codecpar)', - use='ffmpeg'), + use='libav'), }, { 'name': 'avutil-has-hwcontext', 'desc': 'libavutil AVHWFramesContext API', 'func': check_statement('libavutil/frame.h', '(void)offsetof(AVFrame, hw_frames_ctx)', - use='ffmpeg'), + use='libav'), }, { 'name': 'avutil-st2084', 'desc': 'libavutil AVCOL_TRC_SMPTEST2084', 'func': check_statement('libavutil/pixfmt.h', 'AVCOL_TRC_SMPTEST2084', - use='ffmpeg'), + use='libav'), } ] @@ -863,7 +842,7 @@ hwaccel_features = [ 'name': '--vaapi-hwaccel', 'desc': 'libavcodec VAAPI hwaccel', 'deps': [ 'vaapi' ], - 'func': check_headers('libavcodec/vaapi.h', use='ffmpeg'), + 'func': check_headers('libavcodec/vaapi.h', use='libav'), }, { 'name': '--videotoolbox-hwaccel', 'desc': 'libavcodec videotoolbox hwaccel', @@ -872,7 +851,7 @@ hwaccel_features = [ check_statement('libavcodec/videotoolbox.h', 'av_videotoolbox_alloc_context()', framework='IOSurface', - use='ffmpeg')), + use='libav')), } , { 'name': '--videotoolbox-gl', 'desc': 'Videotoolbox with OpenGL', @@ -884,14 +863,14 @@ hwaccel_features = [ 'deps': [ 'vdpau' ], 'func': check_statement('libavcodec/vdpau.h', 'av_vdpau_bind_context(0,0,0,AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH)', - use='ffmpeg'), + use='libav'), }, { 'name': '--d3d-hwaccel', 'desc': 'libavcodec DXVA2 and D3D11VA hwaccel', 'deps': [ 'win32' ], 'func': compose_checks( - check_headers('libavcodec/dxva2.h', use='ffmpeg'), - check_headers('libavcodec/d3d11va.h', use='ffmpeg')), + check_headers('libavcodec/dxva2.h', use='libav'), + check_headers('libavcodec/d3d11va.h', use='libav')), }, { 'name': 'sse4-intrinsics', 'desc': 'GCC SSE4 intrinsics for GPU memcpy', @@ -985,7 +964,7 @@ def options(opt): help = 'variant name for saving configuration and build results') opt.parse_features('build and install options', build_options) - optional_features = main_dependencies + ffmpeg_dependencies + optional_features = main_dependencies + libav_dependencies opt.parse_features('optional features', optional_features) opt.parse_features('audio outputs', audio_output_features) opt.parse_features('video outputs', video_output_features) @@ -1046,7 +1025,7 @@ def configure(ctx): ctx.parse_dependencies(main_dependencies) ctx.parse_dependencies(audio_output_features) ctx.parse_dependencies(video_output_features) - ctx.parse_dependencies(ffmpeg_dependencies) + ctx.parse_dependencies(libav_dependencies) ctx.parse_dependencies(hwaccel_features) ctx.parse_dependencies(radio_and_tv_features) -- cgit v1.2.3 From 61bc96518afcfabfa07d6724ea517db5e9aba165 Mon Sep 17 00:00:00 2001 From: Bin Jin Date: Fri, 10 Jun 2016 12:22:51 +0000 Subject: vo_opengl: remove nnedi3 prescaler --- wscript | 5 ----- 1 file changed, 5 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index aae6fa175e..1915f7cd67 100644 --- a/wscript +++ b/wscript @@ -10,11 +10,6 @@ from waftools.checks.custom import * build_options = [ { - 'name': '--gpl3', - 'desc': 'GPL3 license', - 'default': 'disable', - 'func': check_true - }, { 'name': '--cplayer', 'desc': 'mpv CLI player', 'default': 'enable', -- cgit v1.2.3