virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2012-06-10 03:08:19 +02:00
parent 8836b41a78
commit 7b0d362567
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/internal.h
View 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);

6
libavfilter/video.c
View 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]);

5
libavfilter/video.h
View File

@ -44,6 +44,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.
*