Let's try this again. Detect older and new versions of ffmpeg and allow for their...

[vlc] / extras / buildsystem / cmake / config.h.cmake

diff --git a/extras/buildsystem/cmake/config.h.cmake b/extras/buildsystem/cmake/config.h.cmake
index 29a1a8d13a12cd347791669ca996e19c520ce5e9..2c5d41e45f3c951622af8e2d753c25155056ccc0 100644 (file)
--- a/extras/buildsystem/cmake/config.h.cmake
+++ b/extras/buildsystem/cmake/config.h.cmake
@@ -90,8 +90,11 @@
 #cmakedefine HAVE_FFMPEG_AVCODEC_H
 #cmakedefine HAVE_FFMPEG_AVFORMAT_H
 #cmakedefine HAVE_FFMPEG_AVUTIL_H
-#cmakedefine HAVE_FFMPEG_AVUTIL_H_
 #cmakedefine HAVE_FFMPEG_SWSCALE_H
+#cmakedefine HAVE_LIBAVCODEC_AVCODEC_H
+#cmakedefine HAVE_LIBAVFORMAT_AVFORMAT_H
+#cmakedefine HAVE_LIBAVUTIL_AVUTIL_H
+#cmakedefine HAVE_LIBSWSCALE_SWSCALE_H
 #cmakedefine HAVE_FLAC_STREAM_DECODER_H
 #cmakedefine HAVE_FONTCONFIG_FONTCONFIG_H
 #cmakedefine HAVE_FORK