[SCM] libav/experimental: Implement avfilter_graph_alloc().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e15aeea6565f0e6386db7738814fcdde46c2dec3
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu Nov 4 20:34:19 2010 +0000

    Implement avfilter_graph_alloc().
    
    Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/APIchanges b/doc/APIchanges
index 81bd819..973b2df 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil:   2009-03-08
 
 API changes, most recent first:
 
+2010-11-04 - r25672 - lavfi 1.55.0 - avfilter_graph_alloc()
+  Add avfilter_graph_alloc() to libavfilter/avfiltergraph.h.
+
 2010-11-02 - r25654 - lavcore 0.12.0 - av_get_bits_per_sample_fmt()
   Add av_get_bits_per_sample_fmt() to libavcore/samplefmt.h and
   deprecate av_get_bits_per_sample_format().
diff --git a/ffmpeg.c b/ffmpeg.c
index ad3f670..5451acd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -345,7 +345,7 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost)
     char args[255];
     int ret;
 
-    graph = av_mallocz(sizeof(AVFilterGraph));
+    graph = avfilter_graph_alloc();
 
     if ((ret = avfilter_open(&ist->input_video_filter, avfilter_get_by_name("buffer"), "src")) < 0)
         return ret;
diff --git a/ffplay.c b/ffplay.c
index 0563e96..3ee107f 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1795,7 +1795,7 @@ static int video_thread(void *arg)
     char sws_flags_str[128];
     FFSinkContext ffsink_ctx = { .pix_fmt = PIX_FMT_YUV420P };
     AVFilterContext *filt_src = NULL, *filt_out = NULL;
-    AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph));
+    AVFilterGraph *graph = avfilter_graph_alloc();
     snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
     graph->scale_sws_opts = av_strdup(sws_flags_str);
 
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index e8146e0..ee1e0ad 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 54
+#define LIBAVFILTER_VERSION_MINOR 55
 #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 baffc51..6aa0815 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -26,6 +26,11 @@
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
+AVFilterGraph *avfilter_graph_alloc(void)
+{
+    return av_mallocz(sizeof(AVFilterGraph));
+}
+
 void avfilter_graph_destroy(AVFilterGraph *graph)
 {
     for(; graph->filter_count > 0; graph->filter_count --)
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index efb9cc0..0b08f02 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -32,6 +32,11 @@ typedef struct AVFilterGraph {
 } AVFilterGraph;
 
 /**
+ * Allocate a filter graph.
+ */
+AVFilterGraph *avfilter_graph_alloc(void);
+
+/**
  * Get a filter instance with name name from graph.
  *
  * @return the pointer to the found filter instance or NULL if it

-- 
Libav/FFmpeg packaging