Clément Bœsch 
							
						 
					 
					
						
						
							
						
						f21d0beb0c 
					 
					
						
						
							
							Fix a few heigth/height typo.  
						
						 
						
						
						
						
					 
					
						2014-02-07 09:33:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						325f6e0a97 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						 
						
						... 
						
						
						
						* qatar/master:
  lavfi: do not export the filters from shared objects
Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-10-29 11:58:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						cd1b22d8e8 
					 
					
						
						
							
							avfilter/dualinput: simplify  
						
						 
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-30 08:47:40 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas George 
							
						 
					 
					
						
						
							
						
						231e50157c 
					 
					
						
						
							
							lavfi/dualinput: reimplement on top of framesync.  
						
						 
						
						
						
						
					 
					
						2013-09-23 09:50:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						68f328fcdd 
					 
					
						
						
							
							avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop  
						
						 
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-09-21 03:11:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Birkbeck 
							
						 
					 
					
						
						
							
						
						a11c16a0b0 
					 
					
						
						
							
							avfilter/vf_psnr: Prevent integer overflow.  
						
						 
						
						... 
						
						
						
						The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-09-21 03:10:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						b211607b5c 
					 
					
						
						
							
							avfilter: various cosmetics  
						
						 
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-12 14:01:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						bf5ceeffc3 
					 
					
						
						
							
							avfilter/vf_psnr: >8 bit planar support  
						
						 
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-10 16:45:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						0227b42926 
					 
					
						
						
							
							avfilter/vf_psnr: refactor subsampled format support  
						
						 
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-08 12:01:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						3c5071db88 
					 
					
						
						
							
							lavfi/psnr: rename 's' parameter to match documentation  
						
						 
						
						... 
						
						
						
						Also removes some irrelevant lines in documentation.
Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-07-09 09:40:53 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						a03e79ed5a 
					 
					
						
						
							
							lavfi: fix broken logic in metadata handling  
						
						 
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-07-08 20:13:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						6150bec3f8 
					 
					
						
						
							
							lavfi: add psnr filter  
						
						 
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-07-08 14:58:04 +00:00