generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests 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

7
doc/APIchanges
View File

@@ -16,6 +16,13 @@ libavutil: 2012-10-22
API changes, most recent first:
2013-05-24 - xxxxxxx - lavfi 3.70.100 - avfilter.h
Add support for slice multithreading to lavfi. Filters supporting threading
are marked with AVFILTER_FLAG_SLICE_THREADS.
New fields AVFilterContext.thread_type, AVFilterGraph.thread_type and
AVFilterGraph.nb_threads (accessible directly or through AVOptions) may be
used to configure multithreading.
2013-05-24 - xxxxxxx - lavu 52.34.100 - cpu.h
Add av_cpu_count() function for getting the number of logical CPUs.