summaryrefslogtreecommitdiff
path: root/libavfilter/filtfmts.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-12 01:01:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-12 01:31:55 +0200
commit710b0aa8012a25b646d6c0f0853fddcd79fc5e1b (patch)
tree0a87978efc6a0f60ef99d7a24a833c91a4a2c837 /libavfilter/filtfmts.c
parenteb0f774d4bfdb1e5cb131f63580417cfb6b47514 (diff)
parent48a5adab62bd2a553f5069d41fa632a0701835e5 (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/filtfmts.c')
-rw-r--r--libavfilter/filtfmts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c
index 72867292a9..61b002d119 100644
--- a/libavfilter/filtfmts.c
+++ b/libavfilter/filtfmts.c
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
filter_name);
return 1;
}
- if (avfilter_init_filter(filter_ctx, filter_args, NULL) < 0) {
+ if (avfilter_init_str(filter_ctx, filter_args) < 0) {
fprintf(stderr, "Impossible to init filter '%s' with arguments '%s'\n",
filter_name, filter_args);
return 1;