| 
							
							
								 Clément Bœsch | 8ef57a0d61 | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:34 +02:00 |  | 
			
				
					| 
							
							
								 Vittorio Giovara | 41ed7ab45f | cosmetics: Fix spelling mistakes Signed-off-by: Diego Biurrun <diego@biurrun.de> | 2016-05-04 18:16:21 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 6f373d75e8 | Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc' * commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
  vf_interlace: Add SIMD for lowpass filter
Conflicts:
	libavfilter/vf_interlace.c
	libavfilter/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 02:39:49 +01:00 |  | 
			
				
					| 
							
							
								 Kieran Kunhya | 2e1704059a | vf_interlace: Add SIMD for lowpass filter Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 2014-11-15 00:35:31 +01:00 |  |