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

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

diff --git a/modules/codec/ffmpeg/deinterlace.c b/modules/codec/ffmpeg/deinterlace.c
index db46f77a950a3bd39ae097009ad2c37a9d642e94..3fc6f38450a0e1043549aef4432749e5226167d0 100644 (file)
--- a/modules/codec/ffmpeg/deinterlace.c
+++ b/modules/codec/ffmpeg/deinterlace.c
@@ -35,7 +35,9 @@
 #include <vlc_filter.h>
 
 /* ffmpeg header */
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+#   include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
 #   include <ffmpeg/avcodec.h>
 #else
 #   include <avcodec.h>