diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 17:20:05 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-03 17:20:05 +0400 |
| commit | d3fc2db47e8595e737a1d58689d2bf29c9190c80 (patch) | |
| tree | 08691396be93c1f0a7c771e728f027e29689278e /libavfilter/graphparser.c | |
| parent | 4d636947b4e21eabb01d96ebe57ddc455599a173 (diff) | |
| parent | 6e3c13a559e9ff300b5ca60e1d503e594d7f055c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/graphparser.c')
| -rw-r--r-- | libavfilter/graphparser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 8d2fffc194..a1e1b37fc9 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -122,8 +122,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind return ret; } - if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") - && ctx->scale_sws_opts) { + 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; |