aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-10 17:31:43 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-02-10 17:31:43 +0000
commit3363622a63a112ffc2cf3bfde1c807c3ff8f32a6 (patch)
tree8408f131db36a49cf20f9ac18ff0f1e1421a98bd
parent7eca267199ef83e0bc825b4a9fe0fc799822540c (diff)
downloadqmmp-3363622a63a112ffc2cf3bfde1c807c3ff8f32a6.tar.gz
qmmp-3363622a63a112ffc2cf3bfde1c807c3ff8f32a6.tar.bz2
qmmp-3363622a63a112ffc2cf3bfde1c807c3ff8f32a6.zip
updated qmake support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3220 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--qmmp.pri1
-rw-r--r--src/plugins/Input/Input.pro6
2 files changed, 6 insertions, 1 deletions
diff --git a/qmmp.pri b/qmmp.pri
index bf7e14174..1178fdb72 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -39,3 +39,4 @@ CONFIG += HAL_PLUGIN
CONFIG += WITH_ENCA
CONFIG += WITH_PROJECTM20
CONFIG += WITH_SKINNED
+#CONFIG += FFMPEG_LEGACY #uncomment for ffmpeg < 0.9 or libav < 0.8
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index d759279fe..00fabe618 100644
--- a/src/plugins/Input/Input.pro
+++ b/src/plugins/Input/Input.pro
@@ -16,7 +16,11 @@ contains(CONFIG, MODPLUG_PLUGIN){
}
contains(CONFIG, FFMPEG_PLUGIN){
- SUBDIRS += ffmpeg
+ contains(CONFIG, FFMPEG_LEGACY){
+ SUBDIRS += ffmpeg_legacy
+ }else{
+ SUBDIRS += ffmpeg
+ }
}
unix{