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/graphparser.c (1 of 7 files). Show all

Unified · Split

libavfilter/graphparser.c+2−1
@@ -123,7 +123,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind · 122 unmodified lines
123 args = tmp_args;123 args = tmp_args;
124 }124 }
125 125
126 if ((ret = avfilter_init_filter(*filt_ctx, args, NULL)) < 0) {126 ret = avfilter_init_str(*filt_ctx, args);
127 if (ret < 0) {
127 av_log(log_ctx, AV_LOG_ERROR,128 av_log(log_ctx, AV_LOG_ERROR,
128 "Error initializing filter '%s' with args '%s'\n", filt_name, args);129 "Error initializing filter '%s' with args '%s'\n", filt_name, args);
129 return ret;130 return ret;

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