Skip to content

Commit 8654cc1

Browse files
committed
Tweak media reader precedence
1 parent ea9e487 commit 8654cc1

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ option(ENABLE_CLANG_TIDY "Enable clang-tidy, ninja clang-tidy." OFF)
1616
option(ENABLE_CLANG_FORMAT "Enable clang format, ninja clangformat." OFF)
1717
option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." TRUE)
1818
option(OPTIMIZE_FOR_NATIVE "Build with -march=native" OFF)
19-
option(BUILD_RESKIN "Build xstudio reskin binary" ON)
2019
option(OTIO_SUBMODULE "Automatically build OpenTimelineIO as a submodule" OFF)
2120
option(USE_VCPKG "Use Vcpkg for package management" OFF)
2221
option(BUILD_PYSIDE_WIDGETS "Build xstudio player as PySide widget" OFF)
22+
option(OPENIMAGEIO_PLUGIN "Include the OpenImageIO PLugin" ON)
2323

2424
if(WIN32)
2525
set(USE_VCPKG ON)

src/plugin/media_reader/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ add_src_and_test(ffmpeg)
22
add_src_and_test(openexr)
33
add_src_and_test(ppm)
44
add_src_and_test(blank)
5-
add_src_and_test(openimageio)
5+
6+
if (${OPENIMAGEIO_PLUGIN})
7+
add_src_and_test(openimageio)
8+
endif()
69

710
build_studio_plugins("${STUDIO_PLUGINS}")

src/plugin/media_reader/openexr/src/openexr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ ImageBufPtr OpenEXRMediaReader::image(const media::AVFrameID &mptr) {
451451
MRCertainty
452452
OpenEXRMediaReader::supported(const caf::uri &, const std::array<uint8_t, 16> &sig) {
453453
if (sig[0] == 0x76 && sig[1] == 0x2f && sig[2] == 0x31 && sig[3] == 0x01)
454-
return MRC_FULLY;
454+
return MRC_FORCE;
455455

456456
return MRC_NO;
457457
}

0 commit comments

Comments
 (0)