From a626cd7fa0bf04cd72393612505a1f913ea70cd6 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Wed, 22 Jan 2020 21:20:32 +0100
Subject: [ffmpeg] fix link order (#9718)

* [ffmpeg] fix link order

closes #9714

* bump CONTROL

* change link order slightly
---
 ports/ffmpeg/CONTROL             | 2 +-
 ports/ffmpeg/FindFFMPEG.cmake.in | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index 1699baf23..fee79a66a 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.2-3
+Version: 4.2-4
 Build-Depends: zlib
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in
index d5139220b..1562fff05 100644
--- a/ports/ffmpeg/FindFFMPEG.cmake.in
+++ b/ports/ffmpeg/FindFFMPEG.cmake.in
@@ -153,14 +153,14 @@ if (FFMPEG_libavcodec_FOUND AND FFMPEG_libavdevice_FOUND AND FFMPEG_libavfilter_
   set(FFMPEG_libswscale_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
 
   list(APPEND FFMPEG_LIBRARIES
-    ${FFMPEG_libavformat_LIBRARY}
     ${FFMPEG_libavdevice_LIBRARY}
-    ${FFMPEG_libavcodec_LIBRARY}
-    ${FFMPEG_libavutil_LIBRARY}
-    ${FFMPEG_libswscale_LIBRARY}
     ${FFMPEG_libavfilter_LIBRARY}
+    ${FFMPEG_libavformat_LIBRARY}
+    ${FFMPEG_libswscale_LIBRARY}
+    ${FFMPEG_libavcodec_LIBRARY}
     ${FFMPEG_libswresample_LIBRARY}
     ${FFMPEG_libavresample_LIBRARY}
+    ${FFMPEG_libavutil_LIBRARY} 
     ${FFMPEG_libzlib_LIBRARY}
     ${FFMPEG_PLATFORM_DEPENDENT_LIBS}
   )
-- 
cgit v1.2.3