vf_psnr: fix rgb channel order mixup in final log message.
authorRonald S. Bultje <rsbultje@gmail.com>
Sat, 11 Jul 2015 15:21:17 +0000 (11:21 -0400)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 11 Jul 2015 17:13:57 +0000 (19:13 +0200)
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_psnr.c

index cc4546a..74afdaa 100644 (file)
@@ -327,9 +327,11 @@ static av_cold void uninit(AVFilterContext *ctx)
         char buf[256];
 
         buf[0] = 0;
-        for (j = 0; j < s->nb_components; j++)
+        for (j = 0; j < s->nb_components; j++) {
+            int c = s->is_rgb ? s->rgba_map[j] : j;
             av_strlcatf(buf, sizeof(buf), " %c:%0.2f", s->comps[j],
-                        get_psnr(s->mse_comp[j], s->nb_frames, s->max[j]));
+                        get_psnr(s->mse_comp[c], s->nb_frames, s->max[c]));
+        }
         av_log(ctx, AV_LOG_INFO, "PSNR%s average:%0.2f min:%0.2f max:%0.2f\n",
                buf,
                get_psnr(s->mse, s->nb_frames, s->average_max),