[FFmpeg-cvslog] avfilter/trim: drop all audio frames instead of asserting

Paul B Mahol git at videolan.org
Mon Sep 30 13:58:36 EEST 2019


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Sep 30 12:57:26 2019 +0200| [8b36968ef465a01dbb32bdfc6d1c41dd0a8b8158] | committer: Paul B Mahol

avfilter/trim: drop all audio frames instead of asserting

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

 libavfilter/trim.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/trim.c b/libavfilter/trim.c
index 1dbbabbb93..889fe96b9b 100644
--- a/libavfilter/trim.c
+++ b/libavfilter/trim.c
@@ -300,7 +300,8 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame)
     s->nb_samples += frame->nb_samples;
     start_sample   = FFMAX(0, start_sample);
     end_sample     = FFMIN(frame->nb_samples, end_sample);
-    av_assert0(start_sample < end_sample || (start_sample == end_sample && !frame->nb_samples));
+    if (start_sample >= end_sample || !frame->nb_samples)
+        goto drop;
 
     if (start_sample) {
         AVFrame *out = ff_get_audio_buffer(ctx->outputs[0], end_sample - start_sample);



More information about the ffmpeg-cvslog mailing list