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

[vlc] / modules / stream_out / switcher.c

diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index 7dd51c7eae7bf725beae8342496c144db057a601..901d138f14193216d586b163c793220907af58bd 100644 (file)
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -38,9 +38,7 @@
 #include <vlc_network.h>
 
 #define HAVE_MMX
-#if defined(HAVE_LIBAVCODEC_AVCODEC_H)
-#   include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
+#ifdef HAVE_FFMPEG_AVCODEC_H
 #   include <ffmpeg/avcodec.h>
 #else
 #   include <avcodec.h>