Move LIBAVCODEC_VERSION_CHECK so that it is defined when the include …

…files are under ffmpeg
ZoneMinder · Oct 11, 2022 · d6d3ce6 · d6d3ce6
1 parent c78edb3
commit d6d3ce6
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
@@ -125,6 +125,9 @@ extern "C" {
 // AVCODEC
 #if HAVE_LIBAVCODEC_AVCODEC_H
 #include <libavcodec/avcodec.h>
+#elif HAVE_FFMPEG_AVCODEC_H
+#include <ffmpeg/avcodec.h>
+#endif /* HAVE_LIBAVCODEC_AVCODEC_H */
 
 /*
  * LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg
@@ -136,10 +139,6 @@ extern "C" {
     ( (LIBAVCODEC_VERSION_MICRO <  100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
       (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
-#elif HAVE_FFMPEG_AVCODEC_H
-#include <ffmpeg/avcodec.h>
-#endif /* HAVE_LIBAVCODEC_AVCODEC_H */
-
 #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
 #if LIBAVCODEC_VERSION_CHECK(54, 25, 0, 51, 100)
     #define _AVCODECID AVCodecID