History

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

Michael Niedermayer committed 13 years ago

Commit 710b0aa2 parents eb0f774 48a5ada7 files · +41 −3Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 7 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+3−1
@@ -118,7 +118,9 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, · 117 unmodified lines
118 *filt_ctx = avfilter_graph_alloc_filter(graph_ctx, filt, name);118 *filt_ctx = avfilter_graph_alloc_filter(graph_ctx, filt, name);
119 if (!*filt_ctx)119 if (!*filt_ctx)
120 return AVERROR(ENOMEM);120 return AVERROR(ENOMEM);
121 if ((ret = avfilter_init_filter(*filt_ctx, args, opaque)) < 0)121
122 ret = avfilter_init_filter(*filt_ctx, args, opaque);
123 if (ret < 0)
122 goto fail;124 goto fail;
123 125
124 return 0;126 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t