diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-20 19:54:15 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-20 19:54:15 +0000 |
| commit | 170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8 (patch) | |
| tree | a3777f7cc3680b76d298a520a407170ef8143285 /src/config.inc.in | |
| parent | 9bc840d97697bc6445aab17368bad58d02018a2a (diff) | |
| download | usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.tar.gz usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.tar.xz usdx-170917432bdc4e1c52d0fe7ac9bf539cacc2f5f8.zip | |
new detection of ffmpeg version. API changes: SampleFormat -> AVSampleFormat. Configure still needs update. Special thanks to lotan.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2856 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/config.inc.in')
| -rw-r--r-- | src/config.inc.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/config.inc.in b/src/config.inc.in index d57c7ab4..9fdac067 100644 --- a/src/config.inc.in +++ b/src/config.inc.in @@ -10,7 +10,16 @@ {$IFEND} {$@DEFINE_HAVE_FFMPEG@ HaveFFmpeg} -{$IF Defined(HaveFFmpeg) and Defined(IncludeConstants)} +{$IF Defined(HaveFFmpeg)} + {$MACRO ON} + {$IFNDEF FFMPEG_DIR} + {$IF @FFMPEG_VERSION_MINOR@ > 0} + {$DEFINE FFMPEG_DIR := 'ffmpeg-@FFMPEG_VERSION_MAJOR@.@FFMPEG_VERSION_MINOR@'} + {$ELSE} + {$DEFINE FFMPEG_DIR := 'ffmpeg'} + {$IFEND} + {$IFEND} + {$IF Defined(IncludeConstants)} av__codec = 'libavcodec'; LIBAVCODEC_VERSION_MAJOR = @libavcodec_VERSION_MAJOR@; LIBAVCODEC_VERSION_MINOR = @libavcodec_VERSION_MINOR@; @@ -25,6 +34,8 @@ LIBAVUTIL_VERSION_MAJOR = @libavutil_VERSION_MAJOR@; LIBAVUTIL_VERSION_MINOR = @libavutil_VERSION_MINOR@; LIBAVUTIL_VERSION_RELEASE = @libavutil_VERSION_RELEASE@; + + {$IFEND} {$IFEND} {$@DEFINE_HAVE_SWSCALE@ HaveSWScale} |