and move their declaration to internal.h. These functions are never used in application code, so it is better to consider them internal functions, this can be changed later if necessary. Simplify API. Originally committed as revision 25737 to svn://svn.ffmpeg.org/ffmpeg/trunk
Showing the changes to libavfilter/avfiltergraph.c (1 of 5 files). Show all
Unified · Split
| @@ -25,6 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "avfilter.h" | 26 | #include "avfilter.h" |
| 27 | #include "avfiltergraph.h" | 27 | #include "avfiltergraph.h" |
| 28 | #include "internal.h" | ||
| 28 | 29 | ||
| 29 | AVFilterGraph *avfilter_graph_alloc(void) | 30 | AVFilterGraph *avfilter_graph_alloc(void) |
| 30 | { | 31 | { |
| @@ -52,7 +53,7 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) · 21 unmodified lines | |||
| 52 | return 0; | 53 | return 0; |
| 53 | } | 54 | } |
| 54 | 55 | ||
| 55 | int avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) | 56 | int ff_avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) |
| 56 | { | 57 | { |
| 57 | AVFilterContext *filt; | 58 | AVFilterContext *filt; |
| 58 | int i, j; | 59 | int i, j; |
| @@ -82,7 +83,7 @@ int avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx) · 23 unmodified lines | |||
| 82 | return 0; | 83 | return 0; |
| 83 | } | 84 | } |
| 84 | 85 | ||
| 85 | int avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) | 86 | int ff_avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) |
| 86 | { | 87 | { |
| 87 | AVFilterContext *filt; | 88 | AVFilterContext *filt; |
| 88 | int i, ret; | 89 | int i, ret; |
| @@ -194,7 +195,7 @@ static void pick_formats(AVFilterGraph *graph) · 105 unmodified lines | |||
| 194 | } | 195 | } |
| 195 | } | 196 | } |
| 196 | 197 | ||
| 197 | int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) | 198 | int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx) |
| 198 | { | 199 | { |
| 199 | /* find supported formats from sub-filters, and merge along links */ | 200 | /* find supported formats from sub-filters, and merge along links */ |
| 200 | if(query_formats(graph, log_ctx)) | 201 | if(query_formats(graph, log_ctx)) |
| @@ -211,11 +212,11 @@ int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx) · 10 unmodified lines | |||
| 211 | { | 212 | { |
| 212 | int ret; | 213 | int ret; |
| 213 | 214 | ||
| 214 | if ((ret = avfilter_graph_check_validity(graphctx, log_ctx))) | 215 | if ((ret = ff_avfilter_graph_check_validity(graphctx, log_ctx))) |
| 215 | return ret; | 216 | return ret; |
| 216 | if ((ret = avfilter_graph_config_formats(graphctx, log_ctx))) | 217 | if ((ret = ff_avfilter_graph_config_formats(graphctx, log_ctx))) |
| 217 | return ret; | 218 | return ret; |
| 218 | if ((ret = avfilter_graph_config_links(graphctx, log_ctx))) | 219 | if ((ret = ff_avfilter_graph_config_links(graphctx, log_ctx))) |
| 219 | return ret; | 220 | return ret; |
| 220 | 221 | ||
| 221 | return 0; | 222 | return 0; |