Skip to content

Commit

Permalink
Merge pull request #99 from domstoppable/master
Browse files Browse the repository at this point in the history
Backwards compatibility and default local libuvc
  • Loading branch information
marc-tonsen authored Mar 5, 2024
2 parents 9498968 + 8559819 commit 9b3bf14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pyuvc-source/uvc_bindings.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ cdef class Capture:
cdef dict _info
cdef public list controls

def __cinit__(self, dev_uid, extended_controls):
def __cinit__(self, dev_uid, extended_controls=None):
self.dev = NULL
self.ctx = NULL
self.devh = NULL
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
cmake_args = []
cmake_args.append(f"-DUVC_DEBUGGING={os.environ.get('UVC_DEBUGGING', 'OFF')}")
cmake_args.append(
f"-DFORCE_LOCAL_LIBUVC_BUILD={os.environ.get('FORCE_LOCAL_LIBUVC_BUILD', 'OFF')}"
f"-DFORCE_LOCAL_LIBUVC_BUILD={os.environ.get('FORCE_LOCAL_LIBUVC_BUILD', 'ON')}"
)

if platform.system() == "Windows":
Expand Down

0 comments on commit 9b3bf14

Please sign in to comment.