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

[vlc] / modules / stream_out / switcher.c

diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index 91d1867f2bf7760937fdfc9ea98bcf91500c089f..e29e3470f5e2f52fc6f2df20e4d40719cfc3c0be 100644 (file)
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -24,10 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
 #include <math.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
@@ -36,7 +38,9 @@
 #include <vlc_network.h>
 
 #define HAVE_MMX
-#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>