Fix swscale linking

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 3189cc117ae2dc5d9938e39677ae425ff976f6f9..4961b23a443fafda5ed12e684fd69fa49b1a9400 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -41,7 +41,7 @@ SOURCES_canvas = canvas.c
 SOURCES_blendbench = blendbench.c
 SOURCES_chain = chain.c
 SOURCES_postproc = postproc.c
-SOURCES_swscale = swscale.c ../codec/avcodec/chroma.h
+SOURCES_swscale = swscale.c ../codec/avcodec/chroma.c
 SOURCES_imgresample = imgresample.c ../codec/avcodec/chroma.h
 SOURCES_scene = scene.c
 SOURCES_yuvp = yuvp.c

diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index b540491de2e2a7ee372d531ad415cf0ed24c4506..5d8fa2a4bb645a8f077f59a2eb4fa7526b92becb 100644 (file)
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -36,12 +36,15 @@
 
 #ifdef HAVE_LIBSWSCALE_SWSCALE_H
 #   include <libswscale/swscale.h>
+#   include <libavcodec/avcodec.h>
 #elif defined(HAVE_FFMPEG_SWSCALE_H)
 #   include <ffmpeg/swscale.h>
+#   include <ffmpeg/avcodec.h>
 #endif
 
 /* Gruikkkkkkkkkk!!!!! */
-#include "../codec/avcodec/chroma.h"
+#include "../codec/avcodec/avcodec.h"
+#undef AVPALETTE_SIZE
 
 #define AVPALETTE_SIZE (256 * sizeof(uint32_t))