diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 11:44:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 11:44:45 +0100 |
| commit | 68f92a70f1f486c8bc01a1e747a017a6f8dd6861 (patch) | |
| tree | b89449f185b6cb80450e019ab61ed978f1c47047 /libavfilter/vf_fps.c | |
| parent | f245a2086a10327d0fd5ffd0500721729017c772 (diff) | |
| parent | dae1d507af94261bafd3b11549884e5d1eca590e (diff) | |
| download | ffmpeg-68f92a70f1f486c8bc01a1e747a017a6f8dd6861.tar.gz | |
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
vf_fps: add final flushed frames to the dropped frame count
rv34_parser: Adjust #if for disabling individual parsers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_fps.c')
| -rw-r--r-- | libavfilter/vf_fps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index d4305e7273..29eedc7cf5 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -109,6 +109,7 @@ static av_cold void uninit(AVFilterContext *ctx) { FPSContext *s = ctx->priv; if (s->fifo) { + s->drop += av_fifo_size(s->fifo) / sizeof(AVFilterBufferRef*); flush_fifo(s->fifo); av_fifo_free(s->fifo); } |