Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 12:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
Roy Nieterau 2025-12-12 10:21:45 +01:00
parent 197b74d1af
commit 82427cb004
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/ayon_core/lib/transcoding.py
View file

@ -1122,9 +1122,6 @@ def convert_colorspace(
view=None,
display=None,
additional_command_args=None,
frames=None,
frame_padding=None,
parallel_frames=False,
logger=None,
):
"""DEPRECATED function use `oiio_color_convert` instead
@ -1176,6 +1173,9 @@ def oiio_color_convert(
target_display=None,
target_view=None,
additional_command_args=None,
frames=None,
frame_padding=None,
parallel_frames=False,
logger=None,
):
"""Transcode source file to other with colormanagement.
@ -1212,10 +1212,10 @@ def oiio_color_convert(
frames (Optional[str]): Complex frame range to process. This requires
input path and output path to use frame token placeholder like
`#` or `%d`, e.g. file.#.exr
parallel_frames (bool): If True, process frames in parallel inside
the `oiiotool` process. Only supported in OIIO 2.5.20.0+.
frame_padding (Optional[int]): Frame padding to use for the input and
output when using a sequence filepath.
parallel_frames (bool): If True, process frames in parallel inside
the `oiiotool` process. Only supported in OIIO 2.5.20.0+.
logger (logging.Logger): Logger used for logging.
Raises: