From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 25 Nov 2017 18:00:06 +0000
Subject: copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/Input.pro | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/plugins/Input/Input.pro')

diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index a36a0b2e4..eef480670 100644
--- a/src/plugins/Input/Input.pro
+++ b/src/plugins/Input/Input.pro
@@ -16,38 +16,34 @@ contains(CONFIG, MODPLUG_PLUGIN){
 }
 
 contains(CONFIG, FFMPEG_PLUGIN){
-   contains(CONFIG, FFMPEG_LEGACY){
-       SUBDIRS += ffmpeg_legacy
-    }else{
-       SUBDIRS += ffmpeg
-    }
+    SUBDIRS += ffmpeg
 }
 
 contains(CONFIG, GME_PLUGIN){
-  SUBDIRS += gme
+    SUBDIRS += gme
 }
 
 contains(CONFIG, OPUS_PLUGIN){
-  SUBDIRS += opus
+    SUBDIRS += opus
 }
 
 contains(CONFIG, CDAUDIO_PLUGIN){
-  SUBDIRS += cdaudio
+    SUBDIRS += cdaudio
 }
 
 contains(CONFIG, SID_PLUGIN){
-  SUBDIRS += sid
+    SUBDIRS += sid
 }
 
 unix{
 
 contains(CONFIG, AAC_PLUGIN){
-  SUBDIRS += aac
+    SUBDIRS += aac
 }
 
 
 contains(CONFIG, WILDMIDI_PLUGIN){
-  SUBDIRS += wildmidi
+    SUBDIRS += wildmidi
 }
 
 contains(CONFIG, ARCHIVE_PLUGIN){
-- 
cgit v1.2.3-13-gbd6f