X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_libavcodec%2Ftrgt_av.cpp;h=bf8d599e59fcbccda551761965a53724215f6f5f;hb=ce5ffc46ee746fc74cc716b4a4eebdebc471e2e0;hp=e067761dc1dec668329bf19b791410f5a273a88f;hpb=a46bd51d2a00f57d4e5335b77181d93e6b796ee9;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp
index e067761..bf8d599 100644
--- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp
+++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp
@@ -6,6 +6,8 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Paul Wise
+**  Copyright (c) 2008 Gerco Ballintijn
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -35,10 +37,30 @@
 
 extern "C"
 {
-#include <avformat.h>
-#ifdef HAVE_LIBSWSCALE
+
+/*
+	ffmpeg library headers have historically had multiple locations.
+	We should check all of the locations to be more portable.
+*/
+
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+#	include <libavformat/avformat.h>
+#elif defined(HAVE_AVFORMAT_H)
+#	include <avformat.h>
+#elif defined(HAVE_FFMPEG_AVFORMAT_H)
+#	include <ffmpeg/avformat.h>
+#endif
+
+#ifdef WITH_LIBSWSCALE
+#ifdef HAVE_LIBSWSCALE_SWSCALE_H
+#	include <libswscale/swscale.h>
+#elif defined(HAVE_SWSCALE_H)
+#	include <swscale.h>
+#elif defined(HAVE_FFMPEG_SWSCALE_H)
 #	include <ffmpeg/swscale.h>
 #endif
+#endif
+
 }
 
 #include <synfig/general.h>
@@ -392,7 +414,7 @@ public:
 		if ( pict && context->pix_fmt != PIX_FMT_RGB24 )
 		{
 			//We're using RGBA at the moment, write custom conversion code later (get less accuracy errors)
-#ifdef HAVE_LIBSWSCALE
+#ifdef WITH_LIBSWSCALE
 			struct SwsContext* img_convert_ctx =
 				sws_getContext(context->width, context->height, PIX_FMT_RGB24,
 					context->width, context->height, context->pix_fmt,