[FFmpeg-cvslog] r12728 - in trunk/libavfilter: avfiltergraph.c avfiltergraph.h

[vitor]

Author: vitor
Date: Fri Apr  4 22:08:31 2008
New Revision: 12728

Log:
Remove ugly forward declaration
Commited in SoC by Vitor Sessak on 2008-02-24 11:41:22


Modified:
   trunk/libavfilter/avfiltergraph.c
   trunk/libavfilter/avfiltergraph.h

Modified: trunk/libavfilter/avfiltergraph.c
==============================================================================
--- trunk/libavfilter/avfiltergraph.c	(original)
+++ trunk/libavfilter/avfiltergraph.c	Fri Apr  4 22:08:31 2008
@@ -22,11 +22,6 @@
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
-extern AVFilter avfilter_vf_scale;
-extern AVFilter avfilter_vf_graph;
-extern AVFilter avfilter_vf_graphfile;
-extern AVFilter avfilter_vf_graphdesc;
-
 typedef struct AVFilterGraph {
     unsigned filter_count;
     AVFilterContext **filters;
@@ -425,7 +420,8 @@ static int query_formats(AVFilterContext
                     /* couldn't merge format lists. auto-insert scale filter */
                     AVFilterContext *scale;
 
-                    if(!(scale = avfilter_open(&avfilter_vf_scale, NULL)))
+                    if(!(scale =
+                         avfilter_open(avfilter_get_by_name("scale"), NULL)))
                         return -1;
                     if(scale->filter->init(scale, NULL, NULL) ||
                        avfilter_insert_filter(link, scale, 0, 0)) {

Modified: trunk/libavfilter/avfiltergraph.h
==============================================================================
--- trunk/libavfilter/avfiltergraph.h	(original)
+++ trunk/libavfilter/avfiltergraph.h	Fri Apr  4 22:08:31 2008
@@ -86,6 +86,10 @@ typedef struct
     AVFilterGraphDescExport **outputp;  ///< last parsed exported output
 } AVFilterGraphDescParser;
 
+extern AVFilter avfilter_vf_graph;
+extern AVFilter avfilter_vf_graphfile;
+extern AVFilter avfilter_vf_graphdesc;
+
 /**
  * Parse a graph composed of a simple chain of filters which is described by
  * a single string.