diff options
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | ffplay.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.h | 2 | ||||
| -rw-r--r-- | libavfilter/graphparser.c | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 973b2dfe0d..a60df993ca 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-11-04 - r25673 - lavfi 1.56.0 - avfilter_graph_free() + Rename avfilter_graph_destroy() to avfilter_graph_free(). + This change breaks libavfilter API/ABI. + 2010-11-04 - r25672 - lavfi 1.55.0 - avfilter_graph_alloc() Add avfilter_graph_alloc() to libavfilter/avfiltergraph.h. @@ -2628,7 +2628,7 @@ static int transcode(AVFormatContext **output_files, } #if CONFIG_AVFILTER if (graph) { - avfilter_graph_destroy(graph); + avfilter_graph_free(graph); av_freep(&graph); } #endif @@ -1886,7 +1886,7 @@ static int video_thread(void *arg) } the_end: #if CONFIG_AVFILTER - avfilter_graph_destroy(graph); + avfilter_graph_free(graph); av_freep(&graph); #endif av_free(frame); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index ee1e0ad037..7cda6fc06d 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,7 +25,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 55 +#define LIBAVFILTER_VERSION_MINOR 56 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 6aa08157b5..6ce312bbbf 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -31,7 +31,7 @@ AVFilterGraph *avfilter_graph_alloc(void) return av_mallocz(sizeof(AVFilterGraph)); } -void avfilter_graph_destroy(AVFilterGraph *graph) +void avfilter_graph_free(AVFilterGraph *graph) { for(; graph->filter_count > 0; graph->filter_count --) avfilter_destroy(graph->filters[graph->filter_count - 1]); diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 0b08f026d2..793c3a44f4 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -85,6 +85,6 @@ int avfilter_graph_config(AVFilterGraph *graphctx, AVClass *log_ctx); /** * Free a graph and destroy its links. */ -void avfilter_graph_destroy(AVFilterGraph *graph); +void avfilter_graph_free(AVFilterGraph *graph); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index fab0423698..fb70805d4d 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -375,7 +375,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, return 0; fail: - avfilter_graph_destroy(graph); + avfilter_graph_free(graph); free_inout(open_inputs); free_inout(open_outputs); free_inout(curr_inputs); |