Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-10-23 01:00:40 +0300
committerRonald S. Bultje <rsbultje@gmail.com>2015-10-23 13:38:30 +0300
commit0c7b44a01c1564ef681d51a5ed37d3908558143b (patch)
treef286931eb3a0d801f2d227568384506f1849b47b /libavfilter/vf_ssim.c
parenta60539bb5e30d899c45c6ea9079f5b7669539f7a (diff)
vf_psnr/ssim: don't crash if stats_file is NULL.
Diffstat (limited to 'libavfilter/vf_ssim.c')
-rw-r--r--libavfilter/vf_ssim.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c
index 4dc96a73fb..ce1e3db98e 100644
--- a/libavfilter/vf_ssim.c
+++ b/libavfilter/vf_ssim.c
@@ -223,17 +223,19 @@ static av_cold int init(AVFilterContext *ctx)
{
SSIMContext *s = ctx->priv;
- if (!strcmp(s->stats_file_str, "-")) {
- s->stats_file = stdout;
- } else if (s->stats_file_str) {
- s->stats_file = fopen(s->stats_file_str, "w");
- if (!s->stats_file) {
- int err = AVERROR(errno);
- char buf[128];
- av_strerror(err, buf, sizeof(buf));
- av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n",
- s->stats_file_str, buf);
- return err;
+ if (s->stats_file_str) {
+ if (!strcmp(s->stats_file_str, "-")) {
+ s->stats_file = stdout;
+ } else {
+ s->stats_file = fopen(s->stats_file_str, "w");
+ if (!s->stats_file) {
+ int err = AVERROR(errno);
+ char buf[128];
+ av_strerror(err, buf, sizeof(buf));
+ av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n",
+ s->stats_file_str, buf);
+ return err;
+ }
}
}