diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-11-09 17:37:21 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-11-09 17:37:21 +0000 |
| commit | 05063f0d267e4b2350f00c35de3f0ff587db5efd (patch) | |
| tree | 22c3fdd6e0afc251d4dc404c99285da6145d2e5d /mediaplugin/src/plugins/media/ffmpeg | |
| parent | 124205d368360052256f52639e93986ccf33f909 (diff) | |
| download | usdx-05063f0d267e4b2350f00c35de3f0ff587db5efd.tar.gz usdx-05063f0d267e4b2350f00c35de3f0ff587db5efd.tar.xz usdx-05063f0d267e4b2350f00c35de3f0ff587db5efd.zip | |
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
Diffstat (limited to 'mediaplugin/src/plugins/media/ffmpeg')
| -rw-r--r-- | mediaplugin/src/plugins/media/ffmpeg/ffmpeg_core.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 |