From aab3498cd5925b564f450b3586e7bb16cb9a9f49 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 2 May 2019 20:19:52 +0000 Subject: ffmpeg: fixed regressions git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8836 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 2 +- src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index f22e0cfe1..61a4b3a71 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -159,7 +159,7 @@ DecoderProperties DecoderFFmpegFactory::properties() const Decoder *DecoderFFmpegFactory::create(const QString &path, QIODevice *input) { - if(path.contains("://")) + if(path.startsWith("ffmpeg://")) return new DecoderFFmpegCue(path); else return new DecoderFFmpeg(path, input); diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index b7b32a244..d12931d19 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -28,10 +28,18 @@ extern "C" { FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true) { AVFormatContext *in = nullptr; + QString filePath = path; + + if(path.startsWith("ffmpeg://")) + { + filePath.remove("ffmpeg://"); + filePath.remove(QRegExp("#\\d+$")); + } + #ifdef Q_OS_WIN - if (avformat_open_input(&in, path.toUtf8().constData(), nullptr, nullptr) < 0) + if (avformat_open_input(&in, filePath.toUtf8().constData(), nullptr, nullptr) < 0) #else - if (avformat_open_input(&in, path.toLocal8Bit().constData(), nullptr, nullptr) < 0) + if (avformat_open_input(&in, filePath.toLocal8Bit().constData(), nullptr, nullptr) < 0) #endif return; -- cgit v1.2.3-13-gbd6f