diff options
| author | Sven Gothel <[email protected]> | 2021-04-20 07:54:01 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2021-04-20 07:54:01 +0200 |
| commit | f0735c10b1ecf7b12c5e13f74bba5521e11fd8c0 (patch) | |
| tree | cffb590eaa40716a535776d6ce0d09ddddead517 | |
| parent | d788cbfa6c66753ecd0da74c0ff8e85b4d263acd (diff) | |
VAAPI: Remove merge conflict, duplicate --[enable|disable]-vaapi entry in configure.pyhw-encoder-vaapi
| -rw-r--r-- | make/configure.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/make/configure.py b/make/configure.py index b97dab34b..7dbfe4c7e 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1450,10 +1450,6 @@ def createCLI( cross = None ): grp.add_argument( '--enable-qsv', dest="enable_qsv", default=IfHost(True, "x86_64-w64-mingw32", none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) ) grp.add_argument( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) ) - h = IfHost( 'VAAPI video encoder/decoder', '*-*-linux*', '*-*-freebsd*', none=argparse.SUPPRESS).value - grp.add_argument( '--enable-vaapi', dest="enable_vaapi", default=IfHost(True, '*-*-linux*', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) ) - grp.add_argument( '--disable-vaapi', dest="enable_vaapi", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) ) - h = IfHost( 'AMD VCE video encoder', '*-*-linux*', 'x86_64-w64-mingw32', none=argparse.SUPPRESS).value grp.add_argument( '--enable-vce', dest="enable_vce", default=IfHost(True, 'x86_64-w64-mingw32', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) ) grp.add_argument( '--disable-vce', dest="enable_vce", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) ) |