copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 0 insertions, 46 deletions

diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h
deleted file mode 100644
index 78d6a3cd1..000000000
--- a/src/plugins/Input/ffmpeg_legacy/ffmpegmetadatamodel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
- *   forkotov02@ya.ru                                                      *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#ifndef FFMPEGMETADATAMODEL_H
-#define FFMPEGMETADATAMODEL_H
-
-extern "C"{
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(32<<8)+0))
-#include <libavutil/dict.h>
-#endif
-}
-
-#include <qmmp/metadatamodel.h>
-
-class FFmpegMetaDataModel : public MetaDataModel
-{
-Q_OBJECT
-public:
-    FFmpegMetaDataModel(const QString &path, QObject *parent);
-    ~FFmpegMetaDataModel();
-    QHash<QString, QString> audioProperties();
-
-private:
-    AVFormatContext *m_in;
-};
-
-#endif // FFMPEGMETADATAMODEL_H