[vlc-devel] commit: Fix swscale linking ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Oct 19 22:12:52 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Oct 19 23:12:38 2008 +0300| [b08edfb4df4c7693d51946b5bf41f5f77d754ba0] | committer: Rémi Denis-Courmont
Fix swscale linking
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b08edfb4df4c7693d51946b5bf41f5f77d754ba0
---
modules/video_filter/Modules.am | 2 +-
modules/video_filter/swscale.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 3189cc1..4961b23 100644
--- 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 b540491..5d8fa2a 100644
--- 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))
More information about the vlc-devel
mailing list