[FFmpeg-cvslog] Revert "lavfi/atempo: avoid false triggering an assertion failure"

Pavel Koshevoy git at videolan.org
Thu Sep 7 01:02:59 EEST 2017


ffmpeg | branch: master | Pavel Koshevoy <pkoshevoy at gmail.com> | Sun Sep  3 15:34:08 2017 +0200| [edb4ba5bd4e7856fd6aaa37829150957dc5f4da3] | committer: Marton Balint

Revert "lavfi/atempo: avoid false triggering an assertion failure"

This reverts commit 4240e5b047379b29c33dd3f4438bc4e610527b83.

Fixes ticket #6540.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edb4ba5bd4e7856fd6aaa37829150957dc5f4da3
---

 libavfilter/af_atempo.c | 4 ++--
 1 file 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;
     }



More information about the ffmpeg-cvslog mailing list