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

Michael Niedermayer committed 13 years ago

Commit d3fc2db2 parents 4d63694 6e3c13a2 files · +8 −7Browse files

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	122	return ret;
123	123	}
124	124
125		− if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags")
126		− && ctx->scale_sws_opts) {
	125	+ if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") &&
	126	+ ctx->scale_sws_opts) {
127	127	snprintf(tmp_args, sizeof(tmp_args), "%s:%s",
128	128	args, ctx->scale_sws_opts);
129	129	args = tmp_args;

Keyboard shortcuts