Merge topic 'fix_ffmpeg_build_error'

0e5ae6c5 Must have modules are avformat and avcodec
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ken Martin <ken.martin@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !1281

CMake/FindFFMPEG.cmake

@@ -110,9 +110,10 @@ FFMPEG_FIND(LIBAVUTIL   avutil   avutil.h)
 FFMPEG_FIND(LIBSWSCALE  swscale  swscale.h)  # not sure about the header to look for here.
 
 SET(FFMPEG_FOUND "NO")
-# Note we don't check FFMPEG_LIBSWSCALE_FOUND here, it's optional.
-IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND
-      FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND AND STDINT_OK)
+
+# Note we don't check FFMPEG_LIBSWSCALE_FOUND, FFMPEG_LIBAVDEVICE_FOUND,
+# and FFMPEG_LIBAVUTIL_FOUND as they are optional.
+IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND STDINT_OK)
 
     SET(FFMPEG_FOUND "YES")
 
@@ -128,8 +129,4 @@ IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND
         ${FFMPEG_LIBAVCODEC_LIBRARIES}
         ${FFMPEG_LIBAVUTIL_LIBRARIES}
         ${FFMPEG_LIBSWSCALE_LIBRARIES})
-ELSE ()
-
-#    MESSAGE(STATUS "Could not find FFMPEG")
-
-ENDIF()
+ENDIF()
\ No newline at end of file