diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-12-06 16:52:27 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-12-06 16:52:27 +0000 |
| commit | 58317ad312eee14fbdcd56fbab0034b3177584e0 (patch) | |
| tree | aeff2b77bd6756a4ff65d483c157bbfac3e1328b /src/plugins | |
| parent | f0149e3a95c9318d2a6b371be5f8b3de4882c4e5 (diff) | |
| download | qmmp-58317ad312eee14fbdcd56fbab0034b3177584e0.tar.gz qmmp-58317ad312eee14fbdcd56fbab0034b3177584e0.tar.bz2 qmmp-58317ad312eee14fbdcd56fbab0034b3177584e0.zip | |
fixed build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@671 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.h | 10 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpeg.pro | 1 |
4 files changed, 11 insertions, 15 deletions
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 402557c03..1ae7b4172 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -35,7 +35,7 @@ pkg_check_modules(FFMPEG libavcodec libavformat) # old ffmpeg support IF(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) - ADD_DEFINITIONS(-DHAVE_FFMPEG_AVFORMAT_H) + ADD_DEFINITIONS(-DHAVE_LIBAVFORMAT_AVFORMAT_H) include_directories(/usr/include/ffmpeg) ELSEIF(EXISTS /usr/include/ffmpeg/avformat.h) ADD_DEFINITIONS(-DHAVE_FFMPEG_AVFORMAT_H) @@ -48,13 +48,13 @@ ELSE(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) ENDIF(EXISTS /usr/include/ffmpeg/libavformat/avformat.h) IF(EXISTS /usr/include/ffmpeg/libavcodec/avcodec.h) - ADD_DEFINITIONS(-DHAVE_FFMPEG_AVCODEC_H) + ADD_DEFINITIONS(-DHAVE_LIBAVCODEC_AVCODEC_H) include_directories(/usr/include/ffmpeg) ELSEIF(EXISTS /usr/include/ffmpeg/avcodec.h) ADD_DEFINITIONS(-DHAVE_FFMPEG_AVCODEC_H) ELSEIF(EXISTS /usr/include/libavcodec/avcodec.h) ADD_DEFINITIONS(-DHAVE_LIBAVCODEC_AVCODEC_H) -ELSE(EXISTS /usr/include/ffmpeg/avcodec.h) +ELSE(EXISTS /usr/include/ffmpeg/libavcodec/avcodec.h) include_directories(/usr/local/include/ffmpeg /usr/local/include/libavcodec ) diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h index 9e85c9089..ad4ab00b3 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h @@ -22,9 +22,8 @@ #define __decoder_ffmeg_h extern "C"{ -#if defined HAVE_FFMPEG_LIBAVFORMAT_AVFORMAT_H -#include <ffmpeg/libavformat/avformat.h> -#elif defined HAVE_FFMPEG_AVFORMAT_H + +#if defined HAVE_FFMPEG_AVFORMAT_H #include <ffmpeg/avformat.h> #elif defined HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> @@ -32,9 +31,8 @@ extern "C"{ #include <avformat.h> #endif -#if defined HAVE_FFMPEG_LIBAVCODEC_AVCODEC_H -#include <ffmpeg/libavcodec/avcodec.h> -#elif defined HAVE_FFMPEG_AVCODEC_H + +#if defined HAVE_FFMPEG_AVCODEC_H #include <ffmpeg/avcodec.h> #elif defined HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 35abd0eac..22f16799e 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -22,9 +22,7 @@ extern "C" { -#if defined HAVE_FFMPEG_LIBAVFORMAT_AVFORMAT_H -#include <ffmpeg/libavformat/avformat.h> -#elif defined HAVE_FFMPEG_AVFORMAT_H +#if defined HAVE_FFMPEG_AVFORMAT_H #include <ffmpeg/avformat.h> #elif defined HAVE_LIBAVFORMAT_AVFORMAT_H #include <libavformat/avformat.h> @@ -32,9 +30,8 @@ extern "C" #include <avformat.h> #endif -#if defined HAVE_FFMPEG_LIBAVCODEC_AVCODEC_H -#include <ffmpeg/libavcodec/avcodec.h> -#elif defined HAVE_FFMPEG_AVCODEC_H + +#if defined HAVE_FFMPEG_AVCODEC_H #include <ffmpeg/avcodec.h> #elif defined HAVE_LIBAVCODEC_AVCODEC_H #include <libavcodec/avcodec.h> diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro index c6e2e6699..6763c2cf3 100644 --- a/src/plugins/Input/ffmpeg/ffmpeg.pro +++ b/src/plugins/Input/ffmpeg/ffmpeg.pro @@ -20,6 +20,7 @@ INCLUDEPATH += /usr/include/libavformat INCLUDEPATH += /usr/include/libavcodec INCLUDEPATH += /usr/include/ffmpeg/libavcodec INCLUDEPATH += /usr/include/ffmpeg/libavformat +INCLUDEPATH += /usr/include/ffmpeg CONFIG += release \ warn_on \ |