Derek Buitenhuis 
							
						 
					 
					
						
						
							
						
						0d4c0240af 
					 
					
						
						
							
							Merge commit '9c0bc1e980a99106d6749ec632f166b87275871e'  
						
						 
						
						... 
						
						
						
						* commit '9c0bc1e980a99106d6749ec632f166b87275871e':
  qsv: add a missing #include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com > 
						
						
					 
					
						2016-02-24 17:22:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						9c0bc1e980 
					 
					
						
						
							
							qsv: add a missing #include  
						
						 
						
						... 
						
						
						
						Needed for enum AVCodecID 
						
						
					 
					
						2016-02-18 08:47:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Will Kelleher 
							
						 
					 
					
						
						
							
						
						0eac93da0f 
					 
					
						
						
							
							qsvenc: write a53 caption data to SEI  
						
						 
						
						... 
						
						
						
						Signed-off-by: Will Kelleher <wkelleher@gogoair.com >
Previous version reviewed-by: Ivan Uskov <ivan.uskov@nablet.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc > 
						
						
					 
					
						2015-11-30 23:31:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f929081f2e 
					 
					
						
						
							
							Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'  
						
						 
						
						... 
						
						
						
						* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
  qsvdec: properly handle asynchronous decoding
Conflicts:
	libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc > 
						
						
					 
					
						2015-07-19 16:13:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						f5c4d38c78 
					 
					
						
						
							
							qsvdec: properly handle asynchronous decoding  
						
						 
						
						... 
						
						
						
						Wait for async_depth frames before syncing. 
						
						
					 
					
						2015-07-19 09:47:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Uskov 
							
						 
					 
					
						
						
							
						
						ce91bab70f 
					 
					
						
						
							
							libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under linux platform.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc > 
						
						
					 
					
						2015-07-14 02:02:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7871eb4361 
					 
					
						
						
							
							Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'  
						
						 
						
						... 
						
						
						
						* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
  lavc: add Intel libmfx-based HEVC encoder
Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsv.c
	libavcodec/qsvenc.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-07-09 11:53:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						66acb76bb0 
					 
					
						
						
							
							lavc: add Intel libmfx-based HEVC encoder  
						
						 
						
						
						
						
					 
					
						2015-07-08 23:40:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Uskov 
							
						 
					 
					
						
						
							
						
						db89f45535 
					 
					
						
						
							
							avcodec/qsv: Extending QSV/MFX session initialization for the linux platform where a display handle is required.  
						
						 
						
						... 
						
						
						
						Now ff_qsv_init_internal_session() is able
to find appropriate display handle under linux using VAAPI.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-07-02 15:05:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						048b6331e0 
					 
					
						
						
							
							avcodec/qsv_internal: Fix project name  
						
						 
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-28 03:44:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0a731e4596 
					 
					
						
						
							
							Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'  
						
						 
						
						... 
						
						
						
						* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder
Conflicts:
	Changelog
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-28 01:33:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b12eacb383 
					 
					
						
						
							
							Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'  
						
						 
						
						... 
						
						
						
						* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791':
  qsvdec: split off some code that will be shared with the encoder
Conflicts:
	libavcodec/Makefile
	libavcodec/qsvdec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-28 01:16:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						72b7441a10 
					 
					
						
						
							
							lavc: add Intel libmfx-based H.264 encoder  
						
						 
						
						
						
						
					 
					
						2015-03-27 22:02:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						d0a63d8b98 
					 
					
						
						
							
							qsvdec: split off some code that will be shared with the encoder  
						
						 
						
						
						
						
					 
					
						2015-03-27 21:57:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						b04d009b0e 
					 
					
						
						
							
							qsv: rename to qsvdec  
						
						 
						
						... 
						
						
						
						This is to avoid conflicts with the upcoming QSV encoding support. 
						
						
					 
					
						2015-03-27 21:56:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						4e08c82110 
					 
					
						
						
							
							lavc: add an Intel libmfx-based H.264 decoder  
						
						 
						
						... 
						
						
						
						Based on the code by Luca Barbato <lu_zero@gentoo.org > and Yukinori
Yamazoe <drocon11@gmail.com >. 
						
						
					 
					
						2015-02-19 15:08:49 +01:00