libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Jun 2012 01:08:19 +0000 (03:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Jun 2012 01:08:19 +0000 (03:08 +0200)
Its only used through the start_frame pointer and thus cannot be inlined easily.
It also appears to break compilation with some unidentified compiler on darwin.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/internal.h
libavfilter/video.c
libavfilter/video.h

index c208edf..2b99730 100644 (file)
@@ -27,6 +27,7 @@
 #include "avfilter.h"
 #include "avfiltergraph.h"
 #include "formats.h"
+#include "video.h"
 
 #define POOL_SIZE 32
 typedef struct AVFilterPool {
@@ -119,15 +120,6 @@ int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx);
  */
 int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx);
 
-/**
- * Pass video frame along and keep an internal reference for later use.
- */
-static inline void ff_null_start_frame_keep_ref(AVFilterLink *inlink,
-                                                AVFilterBufferRef *picref)
-{
-    avfilter_start_frame(inlink->dst->outputs[0], avfilter_ref_buffer(picref, ~0));
-}
-
 void ff_update_link_current_pts(AVFilterLink *link, int64_t pts);
 
 void ff_free_pool(AVFilterPool *pool);
index d443885..f23592e 100644 (file)
@@ -215,6 +215,12 @@ void ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
     ff_update_link_current_pts(link, link->cur_buf->pts);
 }
 
+void ff_null_start_frame_keep_ref(AVFilterLink *inlink,
+                                                AVFilterBufferRef *picref)
+{
+    avfilter_start_frame(inlink->dst->outputs[0], avfilter_ref_buffer(picref, ~0));
+}
+
 void ff_null_end_frame(AVFilterLink *link)
 {
     ff_end_frame(link->dst->outputs[0]);
index 1fed45f..b6886a6 100644 (file)
@@ -45,6 +45,11 @@ void ff_null_end_frame(AVFilterLink *link);
 void ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref);
 
 /**
+ * Pass video frame along and keep an internal reference for later use.
+ */
+void ff_null_start_frame_keep_ref(AVFilterLink *inlink, AVFilterBufferRef *picref);
+
+/**
  * Notify the next filter that the current frame has finished.
  *
  * @param link the output link the frame was sent over