diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:47:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 14:07:00 +0200 |
| commit | 8d4e969afe6bd15143a8a511587640417b0fb6dd (patch) | |
| tree | 1608095a543b1c3549f20f9ab2d9e326e6e8169e /doc/nut.texi | |
| parent | fe40a9f98f599699b0989d8c8cb35cb24eb2e52f (diff) | |
| parent | 129bb238430ec45a3b5f8f1d384df590ddf7b62f (diff) | |
| download | ffmpeg-8d4e969afe6bd15143a8a511587640417b0fb6dd.tar.gz | |
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>
Diffstat (limited to 'doc/nut.texi')
0 files changed, 0 insertions, 0 deletions