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/avfiltergraph.c | |
| parent | eb0f774d4bfdb1e5cb131f63580417cfb6b47514 (diff) | |
| parent | 48a5adab62bd2a553f5069d41fa632a0701835e5 (diff) | |
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/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 8e8edd5134..3e1d5ef467 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -118,7 +118,9 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, *filt_ctx = avfilter_graph_alloc_filter(graph_ctx, filt, name); if (!*filt_ctx) return AVERROR(ENOMEM); - if ((ret = avfilter_init_filter(*filt_ctx, args, opaque)) < 0) + + ret = avfilter_init_filter(*filt_ctx, args, opaque); + if (ret < 0) goto fail; return 0; |