[FFmpeg-cvslog] r25737 - in trunk: doc/APIchanges libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/internal.h
stefano
subversion
Sat Nov 13 01:21:29 CET 2010
Author: stefano
Date: Sat Nov 13 01:21:28 2010
New Revision: 25737
Log:
Prefix with "ff_" the functions:
ff_avfilter_graph_check_validity()
ff_avfilter_graph_config_links()
ff_avfilter_graph_config_formats()
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.
Modified:
trunk/doc/APIchanges
trunk/libavfilter/avfilter.h
trunk/libavfilter/avfiltergraph.c
trunk/libavfilter/avfiltergraph.h
trunk/libavfilter/internal.h
Modified: trunk/doc/APIchanges
==============================================================================
--- trunk/doc/APIchanges Fri Nov 12 21:15:36 2010 (r25736)
+++ trunk/doc/APIchanges Sat Nov 13 01:21:28 2010 (r25737)
@@ -13,6 +13,14 @@ libavutil: 2009-03-08
API changes, most recent first:
+2010-11-13 - r25737 - lavfi 1.61.0 - avfiltergraph.h
+ Remove declarations from avfiltergraph.h for the functions:
+ avfilter_graph_check_validity()
+ avfilter_graph_config_links()
+ avfilter_graph_config_formats()
+ which are now internal.
+ Use avfilter_graph_config() instead.
+
2010-11-08 - r25708 - lavu 50.33.0 - eval.h
Deprecate functions:
av_parse_and_eval_expr(),
Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h Fri Nov 12 21:15:36 2010 (r25736)
+++ trunk/libavfilter/avfilter.h Sat Nov 13 01:21:28 2010 (r25737)
@@ -25,7 +25,7 @@
#include "libavutil/avutil.h"
#define LIBAVFILTER_VERSION_MAJOR 1
-#define LIBAVFILTER_VERSION_MINOR 60
+#define LIBAVFILTER_VERSION_MINOR 61
#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
Modified: trunk/libavfilter/avfiltergraph.c
==============================================================================
--- trunk/libavfilter/avfiltergraph.c Fri Nov 12 21:15:36 2010 (r25736)
+++ trunk/libavfilter/avfiltergraph.c Sat Nov 13 01:21:28 2010 (r25737)
@@ -25,6 +25,7 @@
#include "avfilter.h"
#include "avfiltergraph.h"
+#include "internal.h"
AVFilterGraph *avfilter_graph_alloc(void)
{
@@ -52,7 +53,7 @@ int avfilter_graph_add_filter(AVFilterGr
return 0;
}
-int avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx)
+int ff_avfilter_graph_check_validity(AVFilterGraph *graph, AVClass *log_ctx)
{
AVFilterContext *filt;
int i, j;
@@ -82,7 +83,7 @@ int avfilter_graph_check_validity(AVFilt
return 0;
}
-int avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx)
+int ff_avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx)
{
AVFilterContext *filt;
int i, ret;
@@ -194,7 +195,7 @@ static void pick_formats(AVFilterGraph *
}
}
-int avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx)
+int ff_avfilter_graph_config_formats(AVFilterGraph *graph, AVClass *log_ctx)
{
/* find supported formats from sub-filters, and merge along links */
if(query_formats(graph, log_ctx))
@@ -211,11 +212,11 @@ int avfilter_graph_config(AVFilterGraph
{
int ret;
- if ((ret = avfilter_graph_check_validity(graphctx, log_ctx)))
+ if ((ret = ff_avfilter_graph_check_validity(graphctx, log_ctx)))
return ret;
- if ((ret = avfilter_graph_config_formats(graphctx, log_ctx)))
+ if ((ret = ff_avfilter_graph_config_formats(graphctx, log_ctx)))
return ret;
- if ((ret = avfilter_graph_config_links(graphctx, log_ctx)))
+ if ((ret = ff_avfilter_graph_config_links(graphctx, log_ctx)))
return ret;
return 0;
Modified: trunk/libavfilter/avfiltergraph.h
==============================================================================
--- trunk/libavfilter/avfiltergraph.h Fri Nov 12 21:15:36 2010 (r25736)
+++ trunk/libavfilter/avfiltergraph.h Sat Nov 13 01:21:28 2010 (r25737)
@@ -53,32 +53,11 @@ AVFilterContext *avfilter_graph_get_filt
int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
/**
- * Check for the validity of graph.
- *
- * A graph is considered valid if all its input and output pads are
- * connected.
- *
- * @return 0 in case of success, a negative value otherwise
- */
-int avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx);
-
-/**
- * Configure all the links of graphctx.
- *
- * @return 0 in case of success, a negative value otherwise
- */
-int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx);
-
-/**
- * Configure the formats of all the links in the graph.
- */
-int avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx);
-
-/**
* Check validity and configure all the links and formats in the graph.
*
- * @see avfilter_graph_check_validity(), avfilter_graph_config_links(),
- * avfilter_graph_config_formats()
+ * @param graphctx the filter graph
+ * @param log_ctx context used for logging
+ * @return 0 in case of success, a negative AVERROR code otherwise
*/
int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx);
Modified: trunk/libavfilter/internal.h
==============================================================================
--- trunk/libavfilter/internal.h Fri Nov 12 21:15:36 2010 (r25736)
+++ trunk/libavfilter/internal.h Sat Nov 13 01:21:28 2010 (r25737)
@@ -25,6 +25,7 @@
*/
#include "avfilter.h"
+#include "avfiltergraph.h"
void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end);
@@ -34,4 +35,26 @@ void ff_dprintf_link(void *ctx, AVFilter
#define FF_DPRINTF_START(ctx, func) dprintf(NULL, "%-16s: ", #func)
+/**
+ * Check for the validity of graph.
+ *
+ * A graph is considered valid if all its input and output pads are
+ * connected.
+ *
+ * @return 0 in case of success, a negative value otherwise
+ */
+int ff_avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx);
+
+/**
+ * Configure all the links of graphctx.
+ *
+ * @return 0 in case of success, a negative value otherwise
+ */
+int ff_avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx);
+
+/**
+ * Configure the formats of all the links in the graph.
+ */
+int ff_avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx);
+
#endif /* AVFILTER_INTERNAL_H */
More information about the ffmpeg-cvslog
mailing list