diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:56:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:31:44 +0200 |
| commit | 86070b8e5a0e0ba087a9ce2a050c00094e29f35b (patch) | |
| tree | 6e82eb3de383fa6f8756c5053d26e52fbf29f07b /libavfilter/graphparser.c | |
| parent | 9da369604ecf31d9dce2dee21ed214b8c43264c6 (diff) | |
| parent | bc1a985ba030e9861d24965d42792850b43a43ea (diff) | |
| download | ffmpeg-86070b8e5a0e0ba087a9ce2a050c00094e29f35b.tar.gz | |
Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'
* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/graphparser.c')
| -rw-r--r-- | libavfilter/graphparser.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 2911b06693..3af9b56021 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -109,16 +109,11 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind return AVERROR(EINVAL); } - ret = avfilter_open(filt_ctx, filt, inst_name); + *filt_ctx = avfilter_graph_alloc_filter(ctx, filt, inst_name); if (!*filt_ctx) { av_log(log_ctx, AV_LOG_ERROR, "Error creating filter '%s'\n", filt_name); - return ret; - } - - if ((ret = avfilter_graph_add_filter(ctx, *filt_ctx)) < 0) { - avfilter_free(*filt_ctx); - return ret; + return AVERROR(ENOMEM); } if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") && |