Derek Buitenhuis
|
1a12eb4a73
|
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
* commit '29c2d06d67724e994980045afa055c6c34611b30':
cosmetics: Drop empty comment lines
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
|
2016-02-24 17:31:44 +00:00 |
Diego Biurrun
|
29c2d06d67
|
cosmetics: Drop empty comment lines
|
2016-02-18 15:35:30 +01:00 |
Michael Niedermayer
|
7381d31f22
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: allow user-provided execute() callbacks
Conflicts:
libavfilter/avfilter.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-09-28 11:02:01 +02:00 |
Anton Khirnov
|
0767bfd199
|
lavfi: allow user-provided execute() callbacks
|
2013-09-28 08:06:19 +02:00 |
|
Michael Niedermayer
|
8d4e969afe
|
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
* 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>
|
2013-05-24 14:07:00 +02:00 |
|
Anton Khirnov
|
129bb23843
|
lavfi: add a slice threading infrastructure
Mostly based on libavcodec's
|
2013-05-24 09:28:18 +02:00 |