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

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

diff --git a/modules/codec/ffmpeg/scale.c b/modules/codec/ffmpeg/scale.c
index 1a2adb5f71a5fd2d8ca9ccfce4accc73196ad8d4..b7e622f014fa0657d6453317d243228b0f00fbbe 100644 (file)
--- a/modules/codec/ffmpeg/scale.c
+++ b/modules/codec/ffmpeg/scale.c
@@ -34,7 +34,7 @@
 #include <vlc_filter.h>
 
 /* ffmpeg headers */
-#if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
 #   include <libavcodec/avcodec.h>
 #elif defined(HAVE_FFMPEG_AVCODEC_H)
 #   include <ffmpeg/avcodec.h>
@@ -42,9 +42,9 @@
 #   include <avcodec.h>
 #endif
 
-#if defined(HAVE_LIBSWSCALE_SWSCALE_H)
+#ifdef HAVE_LIBSWSCALE_SWSCALE_H
 #   include <libswscale/swscale.h>
-#elif defined(HAVE_FFMPEG_H)
+#elif defined(HAVE_FFMPEG_SWSCALE_H)
 #   include <ffmpeg/swscale.h>
 #elif defined(HAVE_LIBSWSCALE_TREE)
 #   include <swscale.h>
@@ -53,7 +53,7 @@
 #include "ffmpeg.h"
 
 /* Version checking */
-#if ( (defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)) )
+#if ( (defined(HAVE_LIBSWSCALE_SWSCALE_H)  || defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)) && (LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)) )
 
 /*****************************************************************************
  * filter_sys_t : filter descriptor