[ffmpeg] fix link order on x64-linux (dependencies must come after th…

…e library that needs the dependency)
microsoft · Nov 2, 2020 · 0d336e2 · 0d336e2
1 parent deabcef
commit 0d336e2
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -261,22 +261,21 @@ if(APPLE)
   list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS ${VT_UNIT} ${AT_UNIT} ${SEC_UNIT} ${CF_UNIT} ${CM_UNIT} ${CV_UNIT})
 endif()
 
-if(@ENABLE_AVCODEC@)
-  FFMPEG_FIND(libavcodec    avcodec    avcodec.h)
-endif()
 if(@ENABLE_AVDEVICE@)
   FFMPEG_FIND(libavdevice   avdevice   avdevice.h)
 endif()
-if(@ENABLE_AVFILTER@)
-  FFMPEG_FIND(libavfilter   avfilter   avfilter.h)
-endif()
 if(@ENABLE_AVFORMAT@)
   FFMPEG_FIND(libavformat   avformat   avformat.h)
 endif()
+if(@ENABLE_AVCODEC@)
+  FFMPEG_FIND(libavcodec    avcodec    avcodec.h)
+endif()
+if(@ENABLE_AVFILTER@)
+  FFMPEG_FIND(libavfilter   avfilter   avfilter.h)
+endif()
 if(@ENABLE_AVRESAMPLE@)
   FFMPEG_FIND(libavresample avresample avresample.h)
 endif()
-FFMPEG_FIND(libavutil       avutil     avutil.h)
 if(@ENABLE_POSTPROC@)
   FFMPEG_FIND(libpostproc   postproc   postprocess.h)
 endif()
@@ -286,6 +285,7 @@ endif()
 if(@ENABLE_SWSCALE@)
   FFMPEG_FIND(libswscale    swscale    swscale.h)
 endif()
+FFMPEG_FIND(libavutil       avutil     avutil.h)
 
 if (FFMPEG_libavutil_FOUND)
   list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)