git.sesse.net Git - ffmpeg/commit

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

author	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Wed, 17 Feb 2016 16:07:16 +0000 (16:07 +0000)
committer	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Wed, 17 Feb 2016 16:07:16 +0000 (16:07 +0000)
commit	26abd5149ebf9602d8036be4c6e72e08c98ea998
tree	ffc931a2c7a53ff57272601f2a43dca7b799c301	tree \| snapshot
parent	ae3c0a9c1f66367586c82e9b48d31bedac3e14aa	commit \| diff
parent	721a4efc0545548a241080b53ab480e34f366240	commit \| diff

Merge commit '721a4efc0545548a241080b53ab480e34f366240'

* commit '721a4efc0545548a241080b53ab480e34f366240':
buffer: add support for pools using caller data in allocation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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