eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '48a5adab62bd2a553f5069d41fa632a0701835e5'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-04-12 01:01:48 +02:00
parent eb0f774d4b 48a5adab62
commit 710b0aa801
7 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/avfiltergraph.c
+3 -1
View File
@@ -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;