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

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

diff --git a/modules/codec/ffmpeg/audio.c b/modules/codec/ffmpeg/audio.c
index 9bc9cef9e6ae38b360d48b2b6722938e563d0033..4731854d2783115add30c6d4b0060dc9fed0c457 100644 (file)
--- a/modules/codec/ffmpeg/audio.c
+++ b/modules/codec/ffmpeg/audio.c
@@ -35,7 +35,9 @@
 #include <vlc_input.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>