aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/graphparser.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-03-17 16:14:58 +0100
committerAnton Khirnov <anton@khirnov.net>2013-04-03 09:29:55 +0200
commit6e3c13a559e9ff300b5ca60e1d503e594d7f055c (patch)
treea831fa7f366b2b2936b0781096a0d60afc3c2052 /libavfilter/graphparser.c
parent817dff578f13ce97576c609ab141508b9dc782e9 (diff)
downloadffmpeg-6e3c13a559e9ff300b5ca60e1d503e594d7f055c.tar.gz
avfiltergraph: check for sws opts being non-NULL before using them.
Avoid snprintfing a NULL pointer. CC: libav-stable@libav.org
Diffstat (limited to 'libavfilter/graphparser.c')
-rw-r--r--libavfilter/graphparser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index ea0a86d51a..3736639eff 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -122,7 +122,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
return ret;
}
- if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags")) {
+ if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") &&
+ ctx->scale_sws_opts) {
snprintf(tmp_args, sizeof(tmp_args), "%s:%s",
args, ctx->scale_sws_opts);
args = tmp_args;