···

       
1
       
 
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
 
       
--- a/CMakeLists.txt

     

       
3
       
 
       
+++ b/CMakeLists.txt

     

       
4
       
-
       
@@ -1832,7 +1832,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)

     

       
5
       
 
       
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)

     

       
6
       
 
       
   if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)

     

       
7
       
 
       
     if(APPLE)

     
···

       
58
       
 
       
-    theora theoradec theoraenc vorbis vorbisenc

     

       
59
       
 
       
-    vorbisfile vpx x264 xvidcore)

     

       
60
       
 
       
+    swresample swscale)

     

       
61
       
-
       
   find_package(FFmpeg)

     

       
62
       
-
       
 endif()

     

       
63
       
-
       
 

     

       
64
       
-
       
@@ -270,7 +263,6 @@ if(WITH_BOOST)

     

       
65
       
 
       
 endif()

     

       
66
       
 
       
 

     

       
67
       
 
       
 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)

     
···

       
69
       
 
       
 endif()

     

       
70
       
 
       
 

     

       
71
       
 
       
 if(WITH_PUGIXML)

     

       
72
       
-
       
@@ -399,7 +391,7 @@ endif()

     

       
73
       
 
       
 

     

       
74
       
 
       
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.

     

       
75
       
 
       
 if(WITH_OPENMP)

     

···

       
1
       
 
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
 
       
--- a/CMakeLists.txt

     

       
3
       
 
       
+++ b/CMakeLists.txt

     

       
4
       
+
       
@@ -1894,7 +1894,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)

     

       
5
       
 
       
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)

     

       
6
       
 
       
   if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)

     

       
7
       
 
       
     if(APPLE)

     
···

       
58
       
 
       
-    theora theoradec theoraenc vorbis vorbisenc

     

       
59
       
 
       
-    vorbisfile vpx x264 xvidcore)

     

       
60
       
 
       
+    swresample swscale)

     

       
61
       
+
       
   if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)

     

       
62
       
+
       
     list(APPEND FFMPEG_FIND_COMPONENTS aom)

     

       
63
       
+
       
   endif()

     

       
64
       
+
       
@@ -273,7 +266,6 @@ if(WITH_BOOST)

     

       
65
       
 
       
 endif()

     

       
66
       
 
       
 

     

       
67
       
 
       
 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)

     
···

       
69
       
 
       
 endif()

     

       
70
       
 
       
 

     

       
71
       
 
       
 if(WITH_PUGIXML)

     

       
72
       
+
       
@@ -402,7 +394,7 @@ endif()

     

       
73
       
 
       
 

     

       
74
       
 
       
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.

     

       
75
       
 
       
 if(WITH_OPENMP)