Hendrik Leppkes 
							
						 
					 
					
						
						
							
						
						4e6f2dbcd3 
					 
					
						
						
							
							Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'  
						
						... 
						
						
						
						* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
  avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com > 
						
						
					 
					
						2016-06-26 15:36:27 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						91450cda2e 
					 
					
						
						
							
							Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'  
						
						... 
						
						
						
						* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
  avconv_vaapi: fix double-free with some unsupported streams
Merged-by: Clément Bœsch <u@pkh.me > 
						
						
					 
					
						2016-06-21 22:22:51 +02:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
							
						
						172d3568b3 
					 
					
						
						
							
							Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'  
						
						... 
						
						
						
						* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
  avconv: VAAPI hwcontext initialisation and hwaccel helper
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com > 
						
						
					 
					
						2016-05-08 22:39:39 +01:00