diff options
| author | Michael Niedermayer <[email protected]> | 2013-05-12 12:49:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-05-12 12:49:36 +0200 |
| commit | 065996b9843b6366bab23d0c6adc61c05c0f9f75 (patch) | |
| tree | a14a67fa5ddf00dbf4a100298f54abf3b7dc67de /libavfilter/graphparser.c | |
| parent | 1ace588f4a94fa607a42971b59483447647c4727 (diff) | |
| parent | 05015d03da1d745bb92915b5cea92dec16af719f (diff) | |
Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1
* commit '05015d03da1d745bb92915b5cea92dec16af719f':
matroska: fix a corner case in ebml-lace parsing
avfiltergraph: check for sws opts being non-NULL before using them.
configure: Enable hwaccels without external dependencies by default.
oma: Validate sample rates
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/oma.c
Merged-by: Michael Niedermayer <[email protected]>
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 0ce823a10d..453e962a7e 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -123,8 +123,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; |