RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_mix: output same number of frames from input for tmix

This commit is contained in:
Paul B Mahol 2022-04-29 21:56:02 +02:00
parent 1148e5f1cc
commit 55e0b041b3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_mix.c
View File

@ -415,8 +415,12 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in)
if (s->nb_frames < s->nb_inputs) {
s->frames[s->nb_frames] = in;
s->nb_frames++;
if (s->nb_frames < s->nb_inputs)
return 0;
while (s->nb_frames < s->nb_inputs) {
s->frames[s->nb_frames] = av_frame_clone(s->frames[s->nb_frames - 1]);
if (!s->frames[s->nb_frames])
return AVERROR(ENOMEM);
s->nb_frames++;
}
} else {
av_frame_free(&s->frames[0]);
memmove(&s->frames[0], &s->frames[1], sizeof(*s->frames) * (s->nb_inputs - 1));
@ -433,7 +437,7 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in)
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out)
return AVERROR(ENOMEM);
out->pts = s->frames[0]->pts;
out->pts = s->frames[s->nb_frames - 1]->pts;
td.out = out;
td.in = s->frames;