configure: Simplify nvenc check (and move it to the correct spot)

[ffmpeg] / libavfilter / vf_fps.c

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 5b2818529a8f8f0947ba1330ee5f964a40a998bd..e5562c85176587e7fa20f71acc7755ccdc29175e 100644 (file)
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -22,6 +22,7 @@
  */
 
 #include <float.h>
+#include <stdint.h>
 
 #include "libavutil/common.h"
 #include "libavutil/fifo.h"
@@ -102,7 +103,7 @@ static av_cold void uninit(AVFilterContext *ctx)
 {
     FPSContext *s = ctx->priv;
     if (s->fifo) {
-        s->drop += av_fifo_size(s->fifo) / sizeof(AVFilterBufferRef*);
+        s->drop += av_fifo_size(s->fifo) / sizeof(AVFrame*);
         flush_fifo(s->fifo);
         av_fifo_free(s->fifo);
     }
@@ -115,9 +116,10 @@ static int config_props(AVFilterLink* link)
 {
     FPSContext   *s = link->src->priv;
 
-    link->time_base = (AVRational){ s->framerate.den, s->framerate.num };
-    link->w         = link->src->inputs[0]->w;
-    link->h         = link->src->inputs[0]->h;
+    link->time_base  = (AVRational){ s->framerate.den, s->framerate.num };
+    link->frame_rate = s->framerate;
+    link->w          = link->src->inputs[0]->w;
+    link->h          = link->src->inputs[0]->h;
 
     return 0;
 }
@@ -289,7 +291,7 @@ static const AVFilterPad avfilter_vf_fps_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_vf_fps = {
+AVFilter ff_vf_fps = {
     .name        = "fps",
     .description = NULL_IF_CONFIG_SMALL("Force constant framerate"),