Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
d10c66c5
Commit
d10c66c5
authored
Oct 07, 2020
by
Jean-Baptiste Mardelle
Browse files
Merge branch '2008'
parents
45c4e5e6
c7dc53a8
Pipeline
#36683
passed with stage
in 13 minutes and 34 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
data/org.kde.kdenlive.appdata.xml
View file @
d10c66c5
...
...
@@ -292,6 +292,8 @@
</artifact>
</artifacts>
</release>
<release
version=
"20.08.0"
date=
"2020-08-13"
/>
<release
date=
"2020-04-15"
version=
"20.07.70"
/>
</releases>
<url
type=
"homepage"
>
https://kdenlive.org/
</url>
<url
type=
"bugtracker"
>
https://bugs.kde.org
</url>
...
...
src/jobs/audiothumbjob.cpp
View file @
d10c66c5
...
...
@@ -217,6 +217,7 @@ bool AudioThumbJob::computeWithFFMPEG()
}
else
if
(
offset
>
250
)
{
intraOffset
=
offset
/
10
;
}
long
maxAudioLevel
=
1
;
if
(
!
m_successful
)
{
m_done
=
true
;
...
...
src/jobs/loadjob.cpp
View file @
d10c66c5
...
...
@@ -424,6 +424,19 @@ bool LoadJob::startJob()
m_errorMessage
.
append
(
i18n
(
"ERROR: Could not load clip %1: producer is invalid"
,
m_resource
));
return
false
;
}
if
(
m_producer
->
get_length
()
==
INT_MAX
&&
m_producer
->
get
(
"eof"
)
==
QLatin1String
(
"loop"
))
{
// This is a live source or broken clip
m_done
=
true
;
m_successful
=
false
;
if
(
m_producer
)
{
m_producer
.
reset
();
}
qDebug
()
<<
"=== MAX DURATION: "
<<
INT_MAX
<<
", DURATION: "
<<
(
INT_MAX
/
25
/
60
);
QMetaObject
::
invokeMethod
(
pCore
.
get
(),
"displayBinMessage"
,
Qt
::
QueuedConnection
,
Q_ARG
(
QString
,
i18n
(
"Cannot get duration for file %1"
,
m_resource
)),
Q_ARG
(
int
,
(
int
)
KMessageWidget
::
Warning
));
m_errorMessage
.
append
(
i18n
(
"ERROR: Could not load clip %1: producer is invalid"
,
m_resource
));
return
false
;
}
processProducerProperties
(
m_producer
,
m_xml
);
QString
clipName
=
Xml
::
getXmlProperty
(
m_xml
,
QStringLiteral
(
"kdenlive:clipname"
));
if
(
clipName
.
isEmpty
())
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment