ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'	Derek Buitenhuis	2016-05-11	1	-0/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are all trivial to merge. * commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12': vaapi_h265: Add -qp option, use it to replace use of -global_quality vaapi_h265: Add constant-bitrate encode support vaapi_h264: Add encode quality option (for quality-speed tradeoff) vaapi_h264: Add -qp option, use it to replace use of -global_quality vaapi_encode: Add support for codec-local options vaapi_h264: Add constant-bitrate encode support vaapi_encode: Refactor slightly to allow easier setting of global options Merged-by: Derek Buitenhuis <[email protected]>
\| *	vaapi_encode: Add support for codec-local options	Mark Thompson	2016-04-15	1	-0/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Anton Khirnov <[email protected]>
\| *	vaapi_encode: Refactor slightly to allow easier setting of global options	Mark Thompson	2016-04-15	1	-0/+13
\| \| \| \| \| \| \| \|	Signed-off-by: Anton Khirnov <[email protected]>
* \|	Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'	Derek Buitenhuis	2016-05-08	1	-4/+4
\|/ \| \| \| \| \| \|	* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e': lavc: VAAPI encode common infrastructure Merged-by: Derek Buitenhuis <[email protected]>
*	lavc: VAAPI encode common infrastructure	Mark Thompson	2016-03-30	1	-0/+1096
	Signed-off-by: Anton Khirnov <[email protected]>