har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ronald S. Bultje 2015-10-22 18:00:40 -04:00
parent a60539bb5e
commit 0c7b44a01c
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_psnr.c
View File

@ -193,9 +193,10 @@ static av_cold int init(AVFilterContext *ctx)
s->min_mse = +INFINITY;
s->max_mse = -INFINITY;
if (s->stats_file_str) {
if (!strcmp(s->stats_file_str, "-")) {
s->stats_file = stdout;
} else if (s->stats_file_str) {
} else {
s->stats_file = fopen(s->stats_file_str, "w");
if (!s->stats_file) {
int err = AVERROR(errno);
@ -206,6 +207,7 @@ static av_cold int init(AVFilterContext *ctx)
return err;
}
}
}
s->dinput.process = do_psnr;
return 0;

4
libavfilter/vf_ssim.c
View File

@ -223,9 +223,10 @@ static av_cold int init(AVFilterContext *ctx)
{
SSIMContext *s = ctx->priv;
if (s->stats_file_str) {
if (!strcmp(s->stats_file_str, "-")) {
s->stats_file = stdout;
} else if (s->stats_file_str) {
} else {
s->stats_file = fopen(s->stats_file_str, "w");
if (!s->stats_file) {
int err = AVERROR(errno);
@ -236,6 +237,7 @@ static av_cold int init(AVFilterContext *ctx)
return err;
}
}
}
s->dinput.process = do_ssim;
s->dinput.shortest = 1;