| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 3b2e99fe9e | avfilter/vf_perspective: factor u cliping code Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2013-08-09 00:03:43 +02:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | 80c6445932 | lavfi: port perspective filter from libmpcodecs Signed-off-by: Paul B Mahol <onemda@gmail.com> | 2013-07-14 16:27:17 +00:00 |  |