1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libswscale/x86
Michael Niedermayer 32c3038734 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: swscale: Place inline assembly code under appropriate #ifdefs
  rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
  configure: Remove redundant RTMPT/RTMPTS dependencies
  configure: add filtering of host cflags/ldflags
  configure: initialise all flag filters at the same place
  configure: add filtering of linker flags
  configure: name some variables more consistently
  configure: remove filter_cppflags
  configure: set icc_version where it is needed
  mpegenc: remove disabled code

Conflicts:
	configure
	libavformat/movenc.c
	libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 05:05:02 +02:00
..
input.asm Fix compilation with old yasm that does not support AVX. 2012-02-14 12:03:55 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
output.asm Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
rgb2rgb_template.c MANGLEd swscale x86 asm to save registers 2012-06-05 03:02:41 +02:00
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
scale.asm sws/x86: add some forgotten 12bit planar yuv cases 2012-07-05 04:38:57 +02:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
swscale_template.c sws: support 12&14 bit planar colorspaces 2012-07-04 23:47:01 +02:00
w64xmmtest.c win64: add a XMM clobber test configure option. 2012-02-02 12:00:48 -08:00
yuv2rgb_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
yuv2rgb_template.c sws: yuv2rgb asm, add memory clobber. 2012-01-12 16:32:55 +01:00