diff options
author | Vitor Sessak <vitor1001@gmail.com> | 2008-05-24 20:41:34 +0000 |
---|---|---|
committer | Vitor Sessak <vitor1001@gmail.com> | 2008-05-24 20:41:34 +0000 |
commit | 8e74c889bce612b69dee204be9112ac28212585d (patch) | |
tree | 1fd96d2087df8ad4ef824205521ceb90c14f5b43 /libavfilter/graphparser.c | |
parent | 74c2f1fbcb10bc928edc4ed6e0963bf2317b3ec9 (diff) | |
download | ffmpeg-8e74c889bce612b69dee204be9112ac28212585d.tar.gz |
Cosmetics: change function order
Commited in SoC by Vitor Sessak on 2008-05-24 12:46:27
Originally committed as revision 13340 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/graphparser.c')
-rw-r--r-- | libavfilter/graphparser.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index bc05b21f5a..e25df592ef 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -27,41 +27,6 @@ #include "avfilter.h" #include "avfiltergraph.h" -static AVFilterContext *create_filter(AVFilterGraph *ctx, int index, - const char *name, const char *args, - AVClass *log_ctx) -{ - AVFilterContext *filt; - - AVFilter *filterdef; - char inst_name[30]; - - snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index); - - if(!(filterdef = avfilter_get_by_name(name))) { - av_log(log_ctx, AV_LOG_ERROR, - "no such filter: '%s'\n", name); - return NULL; - } - - if(!(filt = avfilter_open(filterdef, inst_name))) { - av_log(log_ctx, AV_LOG_ERROR, - "error creating filter '%s'\n", name); - return NULL; - } - - if(avfilter_graph_add_filter(ctx, filt) < 0) - return NULL; - - if(avfilter_init_filter(filt, args, NULL)) { - av_log(log_ctx, AV_LOG_ERROR, - "error initializing filter '%s' with args '%s'\n", name, args); - return NULL; - } - - return filt; -} - static int link_filter(AVFilterContext *src, int srcpad, AVFilterContext *dst, int dstpad, AVClass *log_ctx) @@ -150,6 +115,41 @@ static void parse_link_name(const char **buf, char **name, AVClass *log_ctx) } } +static AVFilterContext *create_filter(AVFilterGraph *ctx, int index, + const char *name, const char *args, + AVClass *log_ctx) +{ + AVFilterContext *filt; + + AVFilter *filterdef; + char inst_name[30]; + + snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index); + + if(!(filterdef = avfilter_get_by_name(name))) { + av_log(log_ctx, AV_LOG_ERROR, + "no such filter: '%s'\n", name); + return NULL; + } + + if(!(filt = avfilter_open(filterdef, inst_name))) { + av_log(log_ctx, AV_LOG_ERROR, + "error creating filter '%s'\n", name); + return NULL; + } + + if(avfilter_graph_add_filter(ctx, filt) < 0) + return NULL; + + if(avfilter_init_filter(filt, args, NULL)) { + av_log(log_ctx, AV_LOG_ERROR, + "error initializing filter '%s' with args '%s'\n", name, args); + return NULL; + } + + return filt; +} + static void free_inout(AVFilterInOut *head) { while(head) { |