diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-22 17:43:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-22 17:43:33 +0200 |
| commit | 9b0736c08ac59ae5da598ef32e9165ddf5c3f645 (patch) | |
| tree | 5754125f2b943c08708b94e111b55e8af597ab0c /libavfilter/graphparser.c | |
| parent | 70a1182a484402fc893d7fe4530d7bb9d636524a (diff) | |
| parent | 3197a9c4fa46972077e12065047c3d52ef4b40f6 (diff) | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
Update changelog for 0.7.8 release
aac: check the maximum number of channels
oggdec: fix faulty cleanup prototype
qdm2: check that the FFT size is a power of 2
rv10: check that extradata is large enough
lavf: make sure stream probe data gets freed.
dfa: check for invalid access in decode_wdlt().
avfiltergraph: check for sws opts being non-NULL before using them.
Conflicts:
Changelog
libavformat/utils.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/graphparser.c')
| -rw-r--r-- | libavfilter/graphparser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 5178eea4c6..1cc8285ad6 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -121,7 +121,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; |