Too many problems with new ffmpeg detection, reverting to last known good (rev 25403).

[vlc] / modules / codec / ffmpeg / mux.c

diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c
index 975921c10c6afd241f069f322af5981d053ceba3..07b8a99f7aeecc9b4aaf26c6a4b93e922a2079d2 100644 (file)
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/codec/ffmpeg/mux.c
@@ -34,8 +34,8 @@
 #include <vlc_sout.h>
 
 /* ffmpeg header */
-#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-#   include <libavformat/avformat.h>
+#ifdef HAVE_FFMPEG_AVFORMAT_H
+#   include <ffmpeg/avformat.h>
 #elif defined(HAVE_LIBAVFORMAT_TREE)
 #   include <avformat.h>
 #endif
@@ -45,7 +45,7 @@
 //#define AVFORMAT_DEBUG 1
 
 /* Version checking */
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
+#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE)
 
 static const char *ppsz_mux_options[] = {
     "mux", NULL
@@ -505,4 +505,4 @@ static offset_t IOSeek( void *opaque, offset_t offset, int whence )
     return 0;
 }
 
-#endif /* HAVE_LIBAVFORMAT_AVFORMAT_H */
+#endif /* HAVE_FFMPEG_AVFORMAT_H */