diff options
Diffstat (limited to 'src')
| -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 |
3 files changed, 3 insertions, 3 deletions
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() |