git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9471122 6d86cef)

author	Mark Thompson <sw@jkqxz.net>
	Mon, 12 Feb 2018 22:28:12 +0000 (22:28 +0000)
committer	Mark Thompson <sw@jkqxz.net>
	Mon, 12 Feb 2018 22:28:12 +0000 (22:28 +0000)
commit	bcab11a1a23d8b156198db352bbdb932740a966c
tree	827e9acc1a7547c1d5d719e2b7db00971d62f281	tree \| snapshot
parent	9471122a1b5dec34572c3d4c675737f0493d140e	commit \| diff
parent	6d86cef06ba36c0ed591e14a2382e9630059fc5d	commit \| diff

Merge commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d'

* commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d':
lavfi: Add support for increasing hardware frame pool sizes

Merged-by: Mark Thompson <sw@jkqxz.net>

doc/APIchanges	diff1 \|	diff2 \|	blob \| history
libavfilter/avfilter.c	diff1 \|	diff2 \|	blob \| history
libavfilter/avfilter.h	diff1 \|	diff2 \|	blob \| history
libavfilter/internal.h	diff1 \|	diff2 \|	blob \| history
libavfilter/version.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.