summaryrefslogtreecommitdiff
path: root/libavfilter/af_amix.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2020-09-13 14:00:27 +0200
committerPaul B Mahol <onemda@gmail.com>2020-09-14 18:16:42 +0200
commit17b44f759e8cbb6952c0ae2dde5fd21adb163651 (patch)
treeabfd2cd0372eb53d78e902feb834ff474ae0052b /libavfilter/af_amix.c
parenta489b6a8e398614d8f719b318bbb02db3da4510d (diff)
avfilter/af_amix: do not leave unset PTS for frames after first stream is over
First stream is used only to get number of samples to put into each output frame.
Diffstat (limited to 'libavfilter/af_amix.c')
-rw-r--r--libavfilter/af_amix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index cae9d4585a..c4d8916a57 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -309,6 +309,8 @@ static int output_frame(AVFilterLink *outlink)
}
}
}
+
+ s->next_pts = frame_list_next_pts(s->frame_list);
} else {
/* first input closed: use the available samples */
nb_samples = INT_MAX;
@@ -324,7 +326,6 @@ static int output_frame(AVFilterLink *outlink)
}
}
- s->next_pts = frame_list_next_pts(s->frame_list);
frame_list_remove_samples(s->frame_list, nb_samples);
calculate_scales(s, nb_samples);