#include <vlc_filter.h>
/* ffmpeg headers */
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+# include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
-#ifdef HAVE_FFMPEG_SWSCALE_H
+#if defined(HAVE_LIBSWSCALE_SWSCALE_H)
+# include <libswscale/swscale.h>
+#elif defined(HAVE_FFMPEG_H)
# include <ffmpeg/swscale.h>
#elif defined(HAVE_LIBSWSCALE_TREE)
# include <swscale.h>
#include "ffmpeg.h"
/* Version checking */
-#if ( (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