diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-02-11 04:56:53 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-02-11 04:56:53 +0000 |
| commit | 39090c75fb8041cbe07f9ddd3eed6cff436176ea (patch) | |
| tree | 31913013780a9572663320708cfc48fb1aec270e | |
| parent | 3a9a1110e1b3c70fd0ec0699b032a3c2b502e121 (diff) | |
| download | qmmp-39090c75fb8041cbe07f9ddd3eed6cff436176ea.tar.gz qmmp-39090c75fb8041cbe07f9ddd3eed6cff436176ea.tar.bz2 qmmp-39090c75fb8041cbe07f9ddd3eed6cff436176ea.zip | |
fixed build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3225 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | README.RUS | 2 | ||||
| -rw-r--r-- | src/plugins/Input/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg_legacy/CMakeLists.txt | 10 |
4 files changed, 11 insertions, 5 deletions
@@ -113,7 +113,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE Available options: - USE_CURL, USE_MMS (transports); - USE_MAD, USE_FLAC, USE_VORBIS, USE_MPC, USE_MODPLUG, USE_SNDFILE, USE_WAVPACK, USE_FFMPEG, USE_AAC, USE_CUE, - USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME (decoders); + USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME, USE_FFMPEG_LEGACY (decoders); - USE_ALSA, USE_OSS, USE_JACK, USE_PULSE, USE_NULL, USE_OSS4, USE_WAVEOUT (output plugins); - USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO (effects); - USE_ANALYZER, USE_PROJECTM (visualization); diff --git a/README.RUS b/README.RUS index b3d8814ac..2364689d2 100644 --- a/README.RUS +++ b/README.RUS @@ -110,7 +110,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE Доступные опции: - USE_CURL, USE_MMS (транспортные модули); - USE_MAD, USE_FLAC, USE_VORBIS, USE_MPC, USE_MODPLUG, USE_SNDFILE, USE_WAVPACK, USE_FFMPEG, USE_AAC, USE_CUE, - USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME (декодеры); + USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME, USE_FFMPEG_LEGACY (декодеры); - USE_ALSA, USE_OSS, USE_JACK, USE_PULSE, USE_NULL, USE_OSS4, USE_WAVEOUT (модули вывода); - USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO (эффекты); - USE_ANALYZER, USE_PROJECTM (визуализация); diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt index 123f14618..ba943f1ff 100644 --- a/src/plugins/Input/CMakeLists.txt +++ b/src/plugins/Input/CMakeLists.txt @@ -3,7 +3,7 @@ SET(USE_MAD TRUE CACHE BOOL "enable/disable mad plugin") SET(USE_FLAC TRUE CACHE BOOL "enable/disable flac plugin") SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin") SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin") -SET(USE_FFMPEG_LEGACY FALSE CACHE BOOL "enable/disable ffmpeg_legacy plugin") +SET(USE_FFMPEG_LEGACY TRUE CACHE BOOL "enable/disable ffmpeg_legacy plugin") SET(USE_MPC TRUE CACHE BOOL "enable/disable mpc plugin") SET(USE_SNDFILE TRUE CACHE BOOL "enable/disable sndfile plugin") SET(USE_WAVPACK TRUE CACHE BOOL "enable/disable wavpack plugin") diff --git a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt index 096a736ab..76015777a 100644 --- a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt @@ -29,8 +29,14 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # minimal supported versions # ffmpeg-0.6: libavcodec-52.72.2, libavformat-52.64.2, libavutil-50.15.1 -pkg_check_modules(FFMPEG_LEGACY libavcodec>=52.72.2 libavformat>=52.64.2 libavutil>=50.15.1) - +pkg_check_modules(FFMPEG_MIN libavcodec>=52.72.2 libavformat>=52.64.2 libavutil>=50.15.1) + +# maximal supported versions +# libav-0.8: libavcodec-53.34.0, libavformat-53.20.0, libavutil-51.21.0 +# ffmpeg-0.9: libavcodec-53.42.0, libavformat-53.24.0, libavutil-51.32.0 +IF(FFMPEG_MIN_FOUND) +pkg_check_modules(FFMPEG_LEGACY libavcodec<=53.33.0 libavformat<=53.19.0 libavutil<=51.20.0) +ENDIF(FFMPEG_MIN_FOUND) include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS}) |