summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-09-17 12:33:31 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-09-17 12:33:31 (GMT)
commit7f17407ae5b728a28dd376a3e2b823f7e56cfc9c (patch)
tree263c616fd869011bd7dff28476e552b2fcd8d776
parent246e684d6bd956e362a7d98d9f7e61405f6ce7e8 (diff)
Fix proxied playlist clips incorrectly detected as AV clips on document opening
CCBUG: 368802
-rw-r--r--src/mltcontroller/clipcontroller.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mltcontroller/clipcontroller.cpp b/src/mltcontroller/clipcontroller.cpp
index cd315c9..94c0822 100644
--- a/src/mltcontroller/clipcontroller.cpp
+++ b/src/mltcontroller/clipcontroller.cpp
@@ -137,7 +137,10 @@ void ClipController::getInfoForProducer()
date = QFileInfo(m_url.path()).lastModified();
m_audioIndex = -1;
m_videoIndex = -1;
- if (m_service == QLatin1String("avformat") || m_service == QLatin1String("avformat-novalidate")) {
+ // special case: playlist with a proxy clip have to be detected separately
+ if (m_usesProxy && m_url.path().endsWith(QStringLiteral(".mlt"))) {
+ m_clipType = Playlist;
+ } else if (m_service == QLatin1String("avformat") || m_service == QLatin1String("avformat-novalidate")) {
m_audioIndex = int_property(QStringLiteral("audio_index"));
m_videoIndex = int_property(QStringLiteral("video_index"));
if (m_audioIndex == -1) {