* qatar/master: avfiltergraph: check for sws opts being non-NULL before using them. Conflicts: libavfilter/avfiltergraph.c libavfilter/graphparser.c
Showing the changes to libavfilter/graphparser.c (1 of 2 files). Show all
Unified · Split
| @@ -122,8 +122,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind · 121 unmodified lines | |||
| 122 | return ret; | 122 | return ret; |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") | 125 | if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") && |
| 126 | && ctx->scale_sws_opts) { | 126 | ctx->scale_sws_opts) { |
| 127 | snprintf(tmp_args, sizeof(tmp_args), "%s:%s", | 127 | snprintf(tmp_args, sizeof(tmp_args), "%s:%s", |
| 128 | args, ctx->scale_sws_opts); | 128 | args, ctx->scale_sws_opts); |
| 129 | args = tmp_args; | 129 | args = tmp_args; |