aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-12-20 11:46:30 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-12-20 11:46:30 +0000
commitae5bd442b79d44b0925e0f9b0e77c3ed74483838 (patch)
tree542693b08f804212b5235561fb886889e29499fd /src/plugins/Input
parente2ea9649d46670bfaecf1fa16adde6e213604497 (diff)
downloadqmmp-ae5bd442b79d44b0925e0f9b0e77c3ed74483838.tar.gz
qmmp-ae5bd442b79d44b0925e0f9b0e77c3ed74483838.tar.bz2
qmmp-ae5bd442b79d44b0925e0f9b0e77c3ed74483838.zip
ffmpeg fixes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@696 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input')
-rw-r--r--src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 9a3dfcce5..e47187b84 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -140,8 +140,7 @@ void DecoderFFmpegFactory::showAbout(QWidget *parent)
QMessageBox::about (parent, tr("About FFmpeg Audio Plugin"),
tr("Qmmp FFmpeg Audio Plugin")+"\n"+
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(17<<8)+0)
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(60<<8)+0)
+#if (LIBAVFORMAT_VERSION_INT >= ((52<<16)+(17<<8)+0)) && (LIBAVCODEC_VERSION_INT >= ((51<<16)+(60<<8)+0))
QString(tr("Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6"))
.arg(LIBAVFORMAT_VERSION_MAJOR)
.arg(LIBAVFORMAT_VERSION_MINOR)
@@ -150,7 +149,6 @@ void DecoderFFmpegFactory::showAbout(QWidget *parent)
.arg(LIBAVCODEC_VERSION_MINOR)
.arg(LIBAVCODEC_VERSION_MICRO)+"\n"+
#endif
-#endif
tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
}