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.h | |
| 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.h')
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h index 992d1aa32..e14f8b93c 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h @@ -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 * @@ -21,15 +21,9 @@ #ifndef FFMPEGMETADATAMODEL_H #define FFMPEGMETADATAMODEL_H -extern "C" -{ -#if defined HAVE_FFMPEG_AVFORMAT_H -#include <ffmpeg/avformat.h> -#elif defined HAVE_LIBAVFORMAT_AVFORMAT_H +extern "C"{ #include <libavformat/avformat.h> -#else -#include <avformat.h> -#endif +#include <libavcodec/avcodec.h> } #include <qmmp/metadatamodel.h> |