X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_asetnsamples.c;h=d0f92d9361c7f482843f36ec8136963bad931567;hb=2b02bc64226ad645e6f97f955bff3fcaf731b25a;hp=8805d53a9714831d42c3a634698537c8c35a3144;hpb=7ae473e8a04f686bbeda75c40167c2df4211e662;p=ffmpeg diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index 8805d53a971..d0f92d9361c 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -62,10 +62,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args) asns->class = &asetnsamples_class; av_opt_set_defaults(asns); - if ((err = av_set_options_string(asns, args, "=", ":")) < 0) { - av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args); + if ((err = av_set_options_string(asns, args, "=", ":")) < 0) return err; - } asns->next_out_pts = AV_NOPTS_VALUE; av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad); @@ -153,7 +151,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) asns->next_out_pts = insamples->pts; avfilter_unref_buffer(insamples); - if (av_audio_fifo_size(asns->fifo) >= asns->nb_out_samples) + while (av_audio_fifo_size(asns->fifo) >= asns->nb_out_samples) push_samples(outlink); return 0; }