James Almer
							
						 
					 | 
					
						
						
						
						
							
						
						
							eba0414768
							
						
					 | 
					
						
						
							
							Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'
						
						
						
						
						
						
						
						* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
  hwcontext: add a QSV implementation
Conflicts:
    doc/APIchanges
    libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
						
						
					 | 
					
						2016-09-28 13:30:27 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hendrik Leppkes
							
						 
					 | 
					
						
						
						
						
							
						
						
							481f320aa3
							
						
					 | 
					
						
						
							
							Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'
						
						
						
						
						
						
						
						* commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
  hwcontext: add a function for opening devices
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 | 
					
						2016-06-26 15:23:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hendrik Leppkes
							
						 
					 | 
					
						
						
						
						
							
						
						
							3689efea3d
							
						
					 | 
					
						
						
							
							Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
						
						
						
						
						
						
						
						* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
  hwcontext: add a dxva2 implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 | 
					
						2016-06-22 22:38:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							59e7361cc7
							
						
					 | 
					
						
						
							
							hwcontext: add a QSV implementation
						
						
						
						
						
						
					 | 
					
						2016-06-21 19:53:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c9e8616c5
							
						
					 | 
					
						
						
							
							hwcontext: add a function for opening devices
						
						
						
						
						
						
					 | 
					
						2016-05-26 15:40:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							c46db38cde
							
						
					 | 
					
						
						
							
							hwcontext: add a dxva2 implementation
						
						
						
						
						
						
					 | 
					
						2016-05-17 09:11:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Derek Buitenhuis
							
						 
					 | 
					
						
						
						
						
							
						
						
							28abb216cb
							
						
					 | 
					
						
						
							
							Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
						
						
						
						
						
						
						
						* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
  lavu: VAAPI hwcontext implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 | 
					
						2016-04-14 13:49:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Derek Buitenhuis
							
						 
					 | 
					
						
						
						
						
							
						
						
							afccfaf26a
							
						
					 | 
					
						
						
							
							Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
						
						
						
						
						
						
						
						* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
  lavu: add a way to query hwcontext frame constraints
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 | 
					
						2016-04-14 13:33:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Thompson
							
						 
					 | 
					
						
						
						
						
							
						
						
							551c6775ab
							
						
					 | 
					
						
						
							
							lavu: VAAPI hwcontext implementation
						
						
						
						
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 | 
					
						2016-03-19 15:40:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Thompson
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1f01e85a9
							
						
					 | 
					
						
						
							
							lavu: add a way to query hwcontext frame constraints
						
						
						
						
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 | 
					
						2016-03-19 15:38:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Derek Buitenhuis
							
						 
					 | 
					
						
						
						
						
							
						
						
							6992276aca
							
						
					 | 
					
						
						
							
							Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073'
						
						
						
						
						
						
						
						* commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073':
  hwcontext: add a CUDA implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 | 
					
						2016-02-24 15:23:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Derek Buitenhuis
							
						 
					 | 
					
						
						
						
						
							
						
						
							d779d8d771
							
						
					 | 
					
						
						
							
							Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
						
						
						
						
						
						
						
						* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
  hwcontext: add a VDPAU implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 | 
					
						2016-02-17 16:16:34 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Derek Buitenhuis
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a708780f3
							
						
					 | 
					
						
						
							
							Merge commit '89923e418b494e337683442ab896d754bc07341a'
						
						
						
						
						
						
						
						* commit '89923e418b494e337683442ab896d754bc07341a':
  lavu: add a framework for handling hwaccel frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 | 
					
						2016-02-17 16:12:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad884d1002
							
						
					 | 
					
						
						
							
							hwcontext: add a CUDA implementation
						
						
						
						
						
						
					 | 
					
						2016-02-14 22:08:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							a001ce31bc
							
						
					 | 
					
						
						
							
							hwcontext: add a VDPAU implementation
						
						
						
						
						
						
					 | 
					
						2016-02-14 22:06:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							89923e418b
							
						
					 | 
					
						
						
							
							lavu: add a framework for handling hwaccel frames
						
						
						
						
						
						
					 | 
					
						2016-02-14 21:36:59 +01:00 | 
					
					
						
						
							
							
							
						
					 |