git.sesse.net Git - ffmpeg/commit

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

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 21 Mar 2015 12:35:34 +0000 (13:35 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 21 Mar 2015 12:35:38 +0000 (13:35 +0100)
commit	a2740a060b36f6612043fa3128f4eb6197d0ce13
tree	f8420993f59d3f5e6fc1a3284862aea4ae6cac3d	tree \| snapshot
parent	c07b7e483af6a0bee49c0ac46030d9b10be4913b	commit \| diff
parent	4bd5ac200d15b4f458a50f66006549825f9fc865	commit \| diff

Merge commit '4bd5ac200d15b4f458a50f66006549825f9fc865'

* commit '4bd5ac200d15b4f458a50f66006549825f9fc865':
h264: move {chroma,intra16x16}_pred_mode into the per-slice context

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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