aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-12-06 16:52:27 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-12-06 16:52:27 +0000
commit58317ad312eee14fbdcd56fbab0034b3177584e0 (patch)
treeaeff2b77bd6756a4ff65d483c157bbfac3e1328b /src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
parentf0149e3a95c9318d2a6b371be5f8b3de4882c4e5 (diff)
downloadqmmp-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/Input/ffmpeg/decoderffmpegfactory.cpp')
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp9
1 files changed, 3 insertions, 6 deletions
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>