git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
f4e593f
)
Revert "lavfi/atempo: avoid false triggering an assertion failure"
author
Pavel Koshevoy
<pkoshevoy@gmail.com>
Sun, 3 Sep 2017 13:34:08 +0000
(15:34 +0200)
committer
Marton Balint
<cus@passwd.hu>
Wed, 6 Sep 2017 21:57:54 +0000
(23:57 +0200)
This reverts commit
4240e5b047379b29c33dd3f4438bc4e610527b83
.
Fixes ticket #6540.
Signed-off-by: Marton Balint <cus@passwd.hu>
libavfilter/af_atempo.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_atempo.c
b/libavfilter/af_atempo.c
index
944df1d
..
9eee8a6
100644
(file)
--- a/
libavfilter/af_atempo.c
+++ b/
libavfilter/af_atempo.c
@@
-914,8
+914,8
@@
static int yae_flush(ATempoContext *atempo,
atempo->state = YAE_FLUSH_OUTPUT;
- if (atempo->position[0]
>
= frag->position[0] + frag->nsamples &&
- atempo->position[1]
>
= frag->position[1] + frag->nsamples) {
+ if (atempo->position[0]
=
= frag->position[0] + frag->nsamples &&
+ atempo->position[1]
=
= frag->position[1] + frag->nsamples) {
// the current fragment is already flushed:
return 0;
}