| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | e43a0a232d | avfilter: fix plane validity checks Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 19:15:46 +02:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | d64f3b72e0 | replace some deprecated defines Signed-off-by: Paul B Mahol <onemda@gmail.com> | 2013-07-06 05:43:24 +00:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | 7de8a38160 | lavfi/vignette: remove extra semi-colon. | 2013-05-31 10:22:03 +02:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | 2886e8065e | lavfi/vignette: add aspect option. | 2013-05-30 20:51:12 +02:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | 33620e243f | lavfi/vignette: add some scaling debug. | 2013-05-30 20:41:56 +02:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | bfafcc4ebe | lavfi/vignette: simplify dmax definition. | 2013-05-30 20:41:37 +02:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | cf6f179044 | lavfi/vignette: fix scale with aspects smaller than one. | 2013-05-30 20:40:39 +02:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | 4a85390d29 | lavfi/vignette: make sure a sane sar is set. | 2013-05-30 18:13:04 +02:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | 0ab9362fcb | lavfi: add vignette filter. | 2013-05-30 17:52:52 +02:00 |  |