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

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

diff --git a/modules/codec/ffmpeg/deinterlace.c b/modules/codec/ffmpeg/deinterlace.c
index 29145a3dc43dab47dc7db5c5cd048256ae3c58c1..db46f77a950a3bd39ae097009ad2c37a9d642e94 100644 (file)
--- a/modules/codec/ffmpeg/deinterlace.c
+++ b/modules/codec/ffmpeg/deinterlace.c
@@ -35,9 +35,7 @@
 #include <vlc_filter.h>
 
 /* ffmpeg header */
-#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>