Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							dbbfbde085 
							
						 
					 
					
						
						
							
							Merge commit 'e8bc642202c10beda1ea4e93ec8492b1e39805e5'  
						
						... 
						
						
						
						Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2016-01-27 16:46:58 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							21f9468402 
							
						 
					 
					
						
						
							
							avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT  
						
						... 
						
						
						
						Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2016-01-27 16:36:46 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e8bc642202 
							
						 
					 
					
						
						
							
							lavu: add AV_CEIL_RSHIFT and use it in various places  
						
						... 
						
						
						
						Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 
					
						2016-01-11 15:32:56 -05:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							1cb78a0dcf 
							
						 
					 
					
						
						
							
							Merge commit '7d12cba95ca15198a930c05458dc414ac00c578b'  
						
						... 
						
						
						
						* commit '7d12cba95ca15198a930c05458dc414ac00c578b':
  vf_framepack: Check and update frame_rate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-11-11 14:58:33 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7d12cba95c 
							
						 
					 
					
						
						
							
							vf_framepack: Check and update frame_rate  
						
						... 
						
						
						
						(cherry picked from ffmpeg commit a46a23d30fea9c8a5570e07ec4d9c9b4eaa6eb4f)
Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2015-11-09 08:09:41 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							f53c4b6a18 
							
						 
					 
					
						
						
							
							lavfi/vf_framepack: fix scheduling.  
						
						
						
						
					 
					
						2015-11-07 16:43:36 +01:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							f35c4ede9e 
							
						 
					 
					
						
						
							
							Merge commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e'  
						
						... 
						
						
						
						* commit 'c9943f00cfa2471d1b8a3a9ddc7a21049a71090e':
  vf_framepack: Use av_image_copy() where appropriate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-09-29 15:44:14 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							c9943f00cf 
							
						 
					 
					
						
						
							
							vf_framepack: Use av_image_copy() where appropriate  
						
						... 
						
						
						
						This correctly adjust chroma subsampling for column interleaved mode,
and allows future high bitdepth support.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 
					
						2015-09-29 14:33:01 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff5a345a4 
							
						 
					 
					
						
						
							
							avfilter: use AVFILTER_DEFINE_CLASS()  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2015-07-02 15:36:00 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							a0854c084e 
							
						 
					 
					
						
						
							
							avfilter: handle error in query_formats() in bunch of filters  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2015-04-08 13:05:06 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a46a23d30f 
							
						 
					 
					
						
						
							
							avfilter/vf_framepack: Check and update frame_rate  
						
						... 
						
						
						
						The frame_rate update was missing leaving the output frame rate
wrong.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-01-16 22:02:52 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39e18b1f40 
							
						 
					 
					
						
						
							
							avfilter/framepack: use FF_CEIL_RSHIFT()  
						
						
						
						
					 
					
						2014-12-30 14:25:41 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							402a411406 
							
						 
					 
					
						
						
							
							Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'  
						
						... 
						
						
						
						* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter
Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/allfilters.c
	libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-01-10 03:00:48 +01:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							a7d0e7ead9 
							
						 
					 
					
						
						
							
							lavfi: add framepack filter  
						
						
						
						
					 
					
						2014-01-09 23:13:05 +01:00