Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'

[ffmpeg] / libavfilter / f_loop.c

diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c
index 00e02154e8670745a0e5f888a56b3621be44f8a2..5a3280772e12271f43085d04d1a26cf670c84bf6 100644 (file)
--- a/libavfilter/f_loop.c
+++ b/libavfilter/f_loop.c
@@ -233,7 +233,6 @@ AVFilter ff_af_aloop = {
     .priv_size     = sizeof(LoopContext),
     .priv_class    = &aloop_class,
     .uninit        = auninit,
-    .query_formats = ff_query_formats_all,
     .inputs        = ainputs,
     .outputs       = aoutputs,
 };
@@ -298,7 +297,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
     LoopContext *s = ctx->priv;
     int ret = 0;
 
-    if (inlink->frame_count >= s->start && s->size > 0 && s->loop != 0) {
+    if (inlink->frame_count_out >= s->start && s->size > 0 && s->loop != 0) {
         if (s->nb_frames < s->size) {
             if (!s->nb_frames)
                 s->start_pts = frame->pts;