diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-04-15 18:08:40 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-04-15 18:08:40 +0000 |
| commit | 2ee8fd4c12b9da5418365c2716eb0e9423fd4e08 (patch) | |
| tree | ddb9882d71c08db2f737250edb1084fc00603f32 /src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | |
| parent | b48e843ac11ed8ffbb5d8155ad91160b42841d93 (diff) | |
| download | qmmp-2ee8fd4c12b9da5418365c2716eb0e9423fd4e08.tar.gz qmmp-2ee8fd4c12b9da5418365c2716eb0e9423fd4e08.tar.bz2 qmmp-2ee8fd4c12b9da5418365c2716eb0e9423fd4e08.zip | |
added latest ffmpeg support, fixed bug with ape seeking, removed legacy
code
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2162 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index fd758661f..933c766b6 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,17 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - -extern "C" -{ -#if defined HAVE_FFMPEG_AVCODEC_H -#include <ffmpeg/avcodec.h> -#elif defined HAVE_LIBAVCODEC_AVCODEC_H -#include <libavcodec/avcodec.h> -#else -#include <avcodec.h> -#endif -} #include "ffmpegmetadatamodel.h" FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) |