aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Koshevoy <pkoshevoy@gmail.com>2017-09-03 15:34:08 +0200
committerMarton Balint <cus@passwd.hu>2017-09-06 23:57:54 +0200
commitedb4ba5bd4e7856fd6aaa37829150957dc5f4da3 (patch)
tree07965828cf9fc68f6851a2ae955bbfba35da76db
parentf4e593f7b51f7cb30986186c187cff939c82d86d (diff)
downloadffmpeg-edb4ba5bd4e7856fd6aaa37829150957dc5f4da3.tar.gz
Revert "lavfi/atempo: avoid false triggering an assertion failure"
This reverts commit 4240e5b047379b29c33dd3f4438bc4e610527b83. Fixes ticket #6540. Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--libavfilter/af_atempo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index 944df1dd32..9eee8a63a8 100644
--- 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;
}