Reverted X264 removal.

ggarra13 · Mar 8, 2024 · d37a701 · d37a701
1 parent 0aa540a
commit d37a701
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/etc/SuperBuild/cmake/Modules/BuildtlRender.cmake b/etc/SuperBuild/cmake/Modules/BuildtlRender.cmake
@@ -8,7 +8,6 @@ set(tlRender_ARGS
     -DTLRENDER_NET=${TLRENDER_NET}
     -DTLRENDER_OCIO=${TLRENDER_OCIO}
     -DTLRENDER_AUDIO=${TLRENDER_AUDIO}
-    -DTLRENDER_X264=${TLRENDER_X264}
     -DTLRENDER_JPEG=${TLRENDER_JPEG}
     -DTLRENDER_TIFF=${TLRENDER_TIFF}
     -DTLRENDER_STB=${TLRENDER_STB}

diff --git a/lib/tlIO/CMakeLists.txt b/lib/tlIO/CMakeLists.txt
@@ -67,9 +67,6 @@ if(TLRENDER_EXR)
     list(APPEND LIBRARIES_PRIVATE OpenEXR::OpenEXR)
 endif()
 if(TLRENDER_FFMPEG)
-    if(TLRENDER_X264)
-	add_definitions(-DTLRENDER_X264)
-    endif()
     list(APPEND HEADERS_PRIVATE FFmpeg.h FFmpegMacros.h FFmpegReadPrivate.h)
     list(APPEND SOURCE FFmpeg.cpp FFmpegRead.cpp FFmpegReadAudio.cpp
         FFmpegReadVideo.cpp FFmpegWrite.cpp)

diff --git a/lib/tlIO/FFmpeg.h b/lib/tlIO/FFmpeg.h
@@ -27,9 +27,7 @@ namespace tl
         enum class Profile
         {
             None,
-#ifdef TLRENDER_X264
             H264,
-#endif
             ProRes,
             ProRes_Proxy,
             ProRes_LT,