git.sesse.net Git - ffmpeg/commit

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

author	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Sat, 7 May 2016 20:35:20 +0000 (21:35 +0100)
committer	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Sat, 7 May 2016 20:35:20 +0000 (21:35 +0100)
commit	578fb5a27d4523c958a1907787b659883a2d9b5b
tree	f6fdba3aec0a5072b005e848ca801ec34442632a	tree \| snapshot
parent	eee5a7cd7d150024ff74fc1ffa78ab5dfb06131c	commit \| diff
parent	d0540fd02171a6233d2016b199d013299debf7e3	commit \| diff

Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'

* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
intrax8: Pass macroblock size to ff_intrax8_common_init

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

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