Commit 0c7b44a0 authored by Ronald S. Bultje's avatar Ronald S. Bultje

vf_psnr/ssim: don't crash if stats_file is NULL.

parent a60539bb
...@@ -193,9 +193,10 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -193,9 +193,10 @@ static av_cold int init(AVFilterContext *ctx)
s->min_mse = +INFINITY; s->min_mse = +INFINITY;
s->max_mse = -INFINITY; s->max_mse = -INFINITY;
if (s->stats_file_str) {
if (!strcmp(s->stats_file_str, "-")) { if (!strcmp(s->stats_file_str, "-")) {
s->stats_file = stdout; s->stats_file = stdout;
} else if (s->stats_file_str) { } else {
s->stats_file = fopen(s->stats_file_str, "w"); s->stats_file = fopen(s->stats_file_str, "w");
if (!s->stats_file) { if (!s->stats_file) {
int err = AVERROR(errno); int err = AVERROR(errno);
...@@ -206,6 +207,7 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -206,6 +207,7 @@ static av_cold int init(AVFilterContext *ctx)
return err; return err;
} }
} }
}
s->dinput.process = do_psnr; s->dinput.process = do_psnr;
return 0; return 0;
......
...@@ -223,9 +223,10 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -223,9 +223,10 @@ static av_cold int init(AVFilterContext *ctx)
{ {
SSIMContext *s = ctx->priv; SSIMContext *s = ctx->priv;
if (s->stats_file_str) {
if (!strcmp(s->stats_file_str, "-")) { if (!strcmp(s->stats_file_str, "-")) {
s->stats_file = stdout; s->stats_file = stdout;
} else if (s->stats_file_str) { } else {
s->stats_file = fopen(s->stats_file_str, "w"); s->stats_file = fopen(s->stats_file_str, "w");
if (!s->stats_file) { if (!s->stats_file) {
int err = AVERROR(errno); int err = AVERROR(errno);
...@@ -236,6 +237,7 @@ static av_cold int init(AVFilterContext *ctx) ...@@ -236,6 +237,7 @@ static av_cold int init(AVFilterContext *ctx)
return err; return err;
} }
} }
}
s->dinput.process = do_ssim; s->dinput.process = do_ssim;
s->dinput.shortest = 1; s->dinput.shortest = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment