diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:01:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:31:55 +0200 |
| commit | 710b0aa8012a25b646d6c0f0853fddcd79fc5e1b (patch) | |
| tree | 0a87978efc6a0f60ef99d7a24a833c91a4a2c837 /libavfilter/graphparser.c | |
| parent | eb0f774d4bfdb1e5cb131f63580417cfb6b47514 (diff) | |
| parent | 48a5adab62bd2a553f5069d41fa632a0701835e5 (diff) | |
| download | ffmpeg-710b0aa8012a25b646d6c0f0853fddcd79fc5e1b.tar.gz | |
Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'
* commit '48a5adab62bd2a553f5069d41fa632a0701835e5':
lavfi: add avfilter_init_str() to replace avfilter_init_filter().
avfilter_graph_create_filter() opaque is still passed to avfilter_init_filter()
which continues to pass it to init_opaque as its still used in the buffer sinks
the sinks should be changed and the opaque passing removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 447b9ebc5d..bd6863e92f 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -123,7 +123,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind args = tmp_args; } - if ((ret = avfilter_init_filter(*filt_ctx, args, NULL)) < 0) { + ret = avfilter_init_str(*filt_ctx, args); + if (ret < 0) { av_log(log_ctx, AV_LOG_ERROR, "Error initializing filter '%s' with args '%s'\n", filt_name, args); return ret; |