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 
							
						 
					 
					
						
						
						
						
							
						
						
							b211607b5c 
							
						 
					 
					
						
						
							
							avfilter: various cosmetics  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-12 14:01:43 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d2a3abf0 
							
						 
					 
					
						
						
							
							lavfi/vidstabdetect: fix direct path.  
						
						... 
						
						
						
						The frame must be writable if the show option is set, otherwise pass the
frame unchanged. 
						
						
					 
					
						2013-04-24 18:30:43 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c82f6e58da 
							
						 
					 
					
						
						
							
							lavfi/vidstab: remove mention of defaults for consistency with other filters.  
						
						
						
						
					 
					
						2013-04-24 18:30:43 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9273cc8eb5 
							
						 
					 
					
						
						
							
							lavfi/vidstab: add missing flags for 2 options.  
						
						
						
						
					 
					
						2013-04-24 18:30:42 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc48775aa 
							
						 
					 
					
						
						
							
							lavfi/vidstab: consistent descriptions.  
						
						
						
						
					 
					
						2013-04-24 18:30:42 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							017051266b 
							
						 
					 
					
						
						
							
							lavfi/vidstab: miscelenaous cosmetics and typo fixes.  
						
						
						
						
					 
					
						2013-04-24 18:30:42 +02:00 
						 
				 
			
				
					
						
							
							
								Georg Martius 
							
						 
					 
					
						
						
						
						
							
						
						
							4364e1f150 
							
						 
					 
					
						
						
							
							lavfi: add video stabilization plugins using vid.stab library  
						
						... 
						
						
						
						vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c
Signed-off-by: Georg Martius <martius@mis.mpg.de> 
						
						
					 
					
						2013-04-24 18:30:42 +02:00