Commit 7b0d3625 authored by Michael Niedermayer's avatar Michael Niedermayer

libavfilter: make ff_null_start_frame_keep_ref() a non static inline function.

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8836b41a
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "avfilter.h" #include "avfilter.h"
#include "avfiltergraph.h" #include "avfiltergraph.h"
#include "formats.h" #include "formats.h"
#include "video.h"
#define POOL_SIZE 32 #define POOL_SIZE 32
typedef struct AVFilterPool { typedef struct AVFilterPool {
...@@ -119,15 +120,6 @@ int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx); ...@@ -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); 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_update_link_current_pts(AVFilterLink *link, int64_t pts);
void ff_free_pool(AVFilterPool *pool); void ff_free_pool(AVFilterPool *pool);
......
...@@ -215,6 +215,12 @@ void ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) ...@@ -215,6 +215,12 @@ void ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
ff_update_link_current_pts(link, link->cur_buf->pts); 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) void ff_null_end_frame(AVFilterLink *link)
{ {
ff_end_frame(link->dst->outputs[0]); ff_end_frame(link->dst->outputs[0]);
......
...@@ -44,6 +44,11 @@ void ff_null_end_frame(AVFilterLink *link); ...@@ -44,6 +44,11 @@ void ff_null_end_frame(AVFilterLink *link);
*/ */
void ff_start_frame(AVFilterLink *link, AVFilterBufferRef *picref); 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. * Notify the next filter that the current frame has finished.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment