From 2f52fee6ad2e8fc159d5dffb9441255d352598df Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 4 May 2008 08:44:00 +0000
Subject: ffmpeg plugin: fixed build scripts (thanks to Stefan Koelling)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@361 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/ffmpeg/CMakeLists.txt           | 17 +++++------------
 src/plugins/Input/ffmpeg/decoder_ffmpeg.h         |  4 ++--
 src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp |  4 ++--
 src/plugins/Input/ffmpeg/detailsdialog.cpp        |  4 ++--
 4 files changed, 11 insertions(+), 18 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt
index 6a41766ab..dd10aa2c7 100644
--- a/src/plugins/Input/ffmpeg/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg/CMakeLists.txt
@@ -29,29 +29,23 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 # libffmpeg and taglib
 PKGCONFIG(libavcodec LIBAVCODEC_INCLUDE_DIR LIBAVCODEC_LINK_DIR LIBAVCODEC_LINK_FLAGS LIBAVCODEC_CFLAGS)
 PKGCONFIG(libavformat LIBAVFORMAT_INCLUDE_DIR LIBAVFORMAT_LINK_DIR LIBAVFORMAT_LINK_FLAGS LIBAVFORMAT_CFLAGS)
-PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
 
 IF(NOT LIBAVCODEC_LINK_FLAGS)
   SET(LIBAVCODEC_LINK_FLAGS -lavcodec)
+  SET(LIBAVCODEC_INCLUDE_DIR /usr/include/ffmpeg)
 ENDIF(NOT LIBAVCODEC_LINK_FLAGS)
 
 IF(NOT LIBAVFORMAT_LINK_FLAGS)
   SET(LIBAVFORMAT_LINK_FLAGS -lavformat)
+  SET(LIBAVFORMAT_INCLUDE_DIR /usr/include/ffmpeg)
 ENDIF(NOT LIBAVFORMAT_LINK_FLAGS)
 
-IF(NOT TAGLIB_LINK_FLAGS)
-  SET(TAGLIB_LINK_FLAGS -ltag)
-  SET(TAGLIB_INCLUDE_DIR /usr/include/taglib)
-  SET(TAGLIB_CFLAGS -I/usr/include/taglib)
-ENDIF(NOT TAGLIB_LINK_FLAGS)
 
-include_directories(${FLAC_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR})
-link_directories(${FLAC_LINK_DIR} ${TAGLIB_LINK_DIR})
+include_directories(${LIBAVCODEC_INCLUDE_DIR} ${LIBAVFORMAT_INCLUDE_DIR})
+link_directories(${LIBAVCODEC_LINK_DIR} ${LIBAVFORMAT_LINK_DIR})
 
 ADD_DEFINITIONS(${LIBAVCODEC_CFLAGS})
 ADD_DEFINITIONS(${LIBAVFORMAT_CFLAGS})
-ADD_DEFINITIONS(${TAGLIB_CFLAGS})
-
 
 SET(libffmpeg_SRCS
   decoder_ffmpeg.cpp
@@ -85,6 +79,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(ffmpeg SHARED ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
   ${libffmpeg_RCC_SRCS})
-target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${LIBAVCODEC_LINK_FLAGS} ${LIBAVFORMAT_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS})
+target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${LIBAVCODEC_LINK_FLAGS} ${LIBAVFORMAT_LINK_FLAGS})
 install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE  GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
-
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
index cdcf224b3..ec0364af4 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
@@ -22,8 +22,8 @@
 #define __decoder_ffmeg_h
 
 extern "C"{
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <avformat.h>
+#include <avcodec.h>
 }
 #include <qmmp/decoder.h>
 
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 3a69a8144..064c9774f 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -1,8 +1,8 @@
 #include <QtGui>
 
 extern "C"{
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <avformat.h>
+#include <avcodec.h>
 }
 
 #include "detailsdialog.h"
diff --git a/src/plugins/Input/ffmpeg/detailsdialog.cpp b/src/plugins/Input/ffmpeg/detailsdialog.cpp
index 076cd6872..8b9994347 100644
--- a/src/plugins/Input/ffmpeg/detailsdialog.cpp
+++ b/src/plugins/Input/ffmpeg/detailsdialog.cpp
@@ -20,8 +20,8 @@
 
 extern "C"
 {
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <avformat.h>
+#include <avcodec.h>
 }
 #include <QFile>
 
-- 
cgit v1.2.3-13-gbd6f