aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Koshevoy <pkoshevoy@gmail.com>2017-09-03 20:44:31 -0600
committerMarton Balint <cus@passwd.hu>2017-09-06 23:57:59 +0200
commit25b5096400b2fd578e059eb4a5d2aba8f3cfddfb (patch)
tree66434de68aaeb5caca41558aa24b3a3cbaf9fdab
parentedb4ba5bd4e7856fd6aaa37829150957dc5f4da3 (diff)
downloadffmpeg-25b5096400b2fd578e059eb4a5d2aba8f3cfddfb.tar.gz
lavfi/atempo: Avoid false triggering an assertion failure
Steps to reproduce: 1. revert 4240e5b047379b29c33dd3f4438bc4e610527b83 2. ./ffmpeg -f lavfi -i sine=d=1 -af aselect=e=0,atempo=0.5 -y atempo.wav Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--libavfilter/af_atempo.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index 9eee8a63a8..8b214bccd7 100644
--- a/libavfilter/af_atempo.c
+++ b/libavfilter/af_atempo.c
@@ -914,6 +914,11 @@ static int yae_flush(ATempoContext *atempo,
atempo->state = YAE_FLUSH_OUTPUT;
+ if (!atempo->nfrag) {
+ // there is nothing to flush:
+ return 0;
+ }
+
if (atempo->position[0] == frag->position[0] + frag->nsamples &&
atempo->position[1] == frag->position[1] + frag->nsamples) {
// the current fragment is already flushed: