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
..
Makefile
input.asm
output.asm
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
rgb2rgb_template.c
scale.asm
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
swscale_template.c
w64xmmtest.c
yuv2rgb_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-22 05:05:02 +02:00
yuv2rgb_template.c