From 05063f0d267e4b2350f00c35de3f0ff587db5efd Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Nov 2010 17:37:21 +0000
Subject: do not define HAVE_SWSCALE twice

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2722 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h b/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h
index 98d9664a..524e37b4 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h
+++ b/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h
@@ -26,7 +26,9 @@
 #define _FFMPEG_CORE_H_
 
 // TODO: check with configure
+#ifndef HAVE_SWSCALE
 #define HAVE_SWSCALE
+#endif
 
 #ifdef HAVE_SWSCALE
 #define USE_SWSCALE
-- 
cgit v1.2.3