Originally committed as revision 12728 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -22,11 +22,6 @@ · 21 unmodified lines | |||
| 22 | #include "avfilter.h" | 22 | #include "avfilter.h" |
| 23 | #include "avfiltergraph.h" | 23 | #include "avfiltergraph.h" |
| 24 | 24 | ||
| 25 | extern AVFilter avfilter_vf_scale; | ||
| 26 | extern AVFilter avfilter_vf_graph; | ||
| 27 | extern AVFilter avfilter_vf_graphfile; | ||
| 28 | extern AVFilter avfilter_vf_graphdesc; | ||
| 29 | |||
| 30 | typedef struct AVFilterGraph { | 25 | typedef struct AVFilterGraph { |
| 31 | unsigned filter_count; | 26 | unsigned filter_count; |
| 32 | AVFilterContext **filters; | 27 | AVFilterContext **filters; |
| @@ -425,7 +420,8 @@ static int query_formats(AVFilterContext *graphctx) · 392 unmodified lines | |||
| 425 | /* couldn't merge format lists. auto-insert scale filter */ | 420 | /* couldn't merge format lists. auto-insert scale filter */ |
| 426 | AVFilterContext *scale; | 421 | AVFilterContext *scale; |
| 427 | 422 | ||
| 428 | if(!(scale = avfilter_open(&avfilter_vf_scale, NULL))) | 423 | if(!(scale = |
| 424 | avfilter_open(avfilter_get_by_name("scale"), NULL))) | ||
| 429 | return -1; | 425 | return -1; |
| 430 | if(scale->filter->init(scale, NULL, NULL) || | 426 | if(scale->filter->init(scale, NULL, NULL) || |
| 431 | avfilter_insert_filter(link, scale, 0, 0)) { | 427 | avfilter_insert_filter(link, scale, 0, 0)) { |
| @@ -86,6 +86,10 @@ typedef struct · 85 unmodified lines | |||
| 86 | AVFilterGraphDescExport **outputp; ///< last parsed exported output | 86 | AVFilterGraphDescExport **outputp; ///< last parsed exported output |
| 87 | } AVFilterGraphDescParser; | 87 | } AVFilterGraphDescParser; |
| 88 | 88 | ||
| 89 | extern AVFilter avfilter_vf_graph; | ||
| 90 | extern AVFilter avfilter_vf_graphfile; | ||
| 91 | extern AVFilter avfilter_vf_graphdesc; | ||
| 92 | |||
| 89 | /** | 93 | /** |
| 90 | * Parse a graph composed of a simple chain of filters which is described by | 94 | * Parse a graph composed of a simple chain of filters which is described by |
| 91 | * a single string. | 95 | * a single string. |