Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'

[ffmpeg] / libavfilter / f_select.c

diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index ec84da8a8496052727d9403a9c47ea993019a615..4d18cbc2372f152d8a7814c250eddd844d1324ce 100644 (file)
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -138,7 +138,7 @@ enum var_name {
     VAR_VARS_NB
 };
 
-typedef struct {
+typedef struct SelectContext {
     const AVClass *class;
     char *expr_str;
     AVExpr *expr;
@@ -279,7 +279,7 @@ static double get_scene_score(AVFilterContext *ctx, AVFrame *frame)
             p2 += 8 * linesize;
         }
         emms_c();
-        mafd = nb_sad ? sad / nb_sad : 0;
+        mafd = nb_sad ? (double)sad / nb_sad : 0;
         diff = fabs(mafd - select->prev_mafd);
         ret  = av_clipf(FFMIN(mafd, diff) / 100., 0, 1);
         select->prev_mafd = mafd;