diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-01-17 15:10:59 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-01-17 15:10:59 +0000 |
| commit | 2783c49ba9f3c9515d57cca6bd0a727f49e084b8 (patch) | |
| tree | 30c7c172cde381b9885cbb09f8bba43e1d6e40f5 | |
| parent | acb3d9b6c3df6dd3eaedefde0f6d82f51681158a (diff) | |
| download | qmmp-2783c49ba9f3c9515d57cca6bd0a727f49e084b8.tar.gz qmmp-2783c49ba9f3c9515d57cca6bd0a727f49e084b8.tar.bz2 qmmp-2783c49ba9f3c9515d57cca6bd0a727f49e084b8.zip | |
fixed ffmpeg 0.9.1 support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2538 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | README.RUS | 2 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -73,7 +73,7 @@ Requirements: - libsndfile >= 1.0.17 (Optional) - wavpack >= 4.41 (Optional) - pulseaudio >= 0.9.15 (Optional) -- ffmpeg >= 0.9.0 (Optional) +- ffmpeg >= 0.9.1 (Optional) - libcdio >= 0.80 (Optional) - libcddb >= 1.3.1 (Optional) - faad2 >= 2.6.1 (Optional) diff --git a/README.RUS b/README.RUS index c2b5f6544..9f7f60c18 100644 --- a/README.RUS +++ b/README.RUS @@ -74,7 +74,7 @@ Qmmp - Qt-based multimedia player - libsndfile >= 1.0.17 (Опционально) - wavpack >= 4.41 (Опционально) - pulseaudio >= 0.9.15 (Опционально) -- ffmpeg >= 0.9.0 (Опционально) +- ffmpeg >= 0.9.1 (Опционально) - libcdio >= 0.80 (Опционально) - libcddb >= 1.3.1 (Опционально) - faad2 >= 2.6.1 (Опционально) diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 8ff6a2dfe..47fa78ef3 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -28,7 +28,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # ffmpeg -pkg_check_modules(FFMPEG libavcodec>=53.25.0 libavformat>=53.24.0 libavutil>=51.32.0) +pkg_check_modules(FFMPEG libavcodec>=53.42.4 libavformat>=53.24.2 libavutil>=51.32.0) include_directories(${FFMPEG_INCLUDE_DIRS}) link_directories(${FFMPEG_LIBRARY_DIRS}) diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 2febee48b..93cc4566b 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -177,7 +177,7 @@ QList<FileInfo *> DecoderFFmpegFactory::createPlayList(const QString &fileName, info->setMetaData(Qmmp::TRACK, track->value); } info->setLength(in->duration/AV_TIME_BASE); - av_close_input_file(in); + avformat_close_input(&in); list << info; return list; } diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 03ad49dfb..c99a0b809 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -37,7 +37,7 @@ FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : FFmpegMetaDataModel::~FFmpegMetaDataModel() { if(m_in) - av_close_input_file(m_in); + avformat_close_input(&m_in); } QHash<QString, QString> FFmpegMetaDataModel::audioProperties() |