diff options
| author | Nicolas George <george@nsup.org> | 2016-08-30 15:28:41 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2016-11-13 10:41:16 +0100 |
| commit | 183ce55b0de0a597b838d08bbac67f54c27ed42f (patch) | |
| tree | ffd40aaf4f522d18b6b87b35e1b49f276cff913d /libavfilter/vf_overlay.c | |
| parent | 22aa649c13b452f11353958a51f073f5fbc3bcaa (diff) | |
| download | ffmpeg-183ce55b0de0a597b838d08bbac67f54c27ed42f.tar.gz | |
lavfi: split frame_count between input and output.
AVFilterLink.frame_count is supposed to count the number of frames
that were passed on the link, but with min_samples, that number is
not always the same for the source and destination filters.
With the addition of a FIFO on the link, the difference will become
more significant.
Split the variable in two: frame_count_in counts the number of
frames that entered the link, frame_count_out counts the number
of frames that were sent to the destination filter.
Diffstat (limited to 'libavfilter/vf_overlay.c')
| -rw-r--r-- | libavfilter/vf_overlay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index b249ad7ee4..108a6fce3c 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -667,7 +667,7 @@ static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic, if (s->eval_mode == EVAL_MODE_FRAME) { int64_t pos = av_frame_get_pkt_pos(mainpic); - s->var_values[VAR_N] = inlink->frame_count; + s->var_values[VAR_N] = inlink->frame_count_out; s->var_values[VAR_T] = mainpic->pts == AV_NOPTS_VALUE ? NAN : mainpic->pts * av_q2d(inlink->time_base); s->var_values[VAR_POS] = pos == -1 ? NAN : pos; |