Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_libavcodec / trgt_av.cpp

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 4584409..5ad733a 100644 (file)
--- 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>
+
+/*
+       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>
@@ -398,8 +420,8 @@ public:
                                        context->width, context->height, context->pix_fmt,
                                        SWS_BICUBIC, NULL, NULL, NULL);
 
-                       sws_scale(img_convert_ctx, pict->data, pict->linesize, 
-                               
+                       sws_scale(img_convert_ctx, pict->data, pict->linesize,
+
                                0, context->height, encodable->data,
                                encodable->linesize);