breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'

Browse Source 
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-24 13:47:45 +02:00
parent fe40a9f98f 129bb23843
commit 8d4e969afe
11 changed files with 446 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/internal.h
View File

@@ -27,6 +27,7 @@
#include "avfilter.h"
#include "avfiltergraph.h"
#include "formats.h"
#include "thread.h"
#include "video.h"
#define POOL_SIZE 32
@@ -141,6 +142,17 @@ struct AVFilterPad {
};
#endif
struct AVFilterGraphInternal {
void *thread;
int (*thread_execute)(AVFilterContext *ctx, action_func *func, void *arg,
int *ret, int nb_jobs);
};
struct AVFilterInternal {
int (*execute)(AVFilterContext *ctx, action_func *func, void *arg,
int *ret, int nb_jobs);
};
/** default handler for freeing audio/video buffer when there are no references left */
void ff_avfilter_default_free_buffer(AVFilterBuffer *buf);