Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jul 2012 03:01:09 +0000 (05:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jul 2012 03:05:02 +0000 (05:05 +0200)
commit32c3038734c97fa02e544447597a04798a67e0e1
tree951dfc08cd81369234ff67560f0603e3fc179282
parent1aeb87fa072450699b1daa953b5b3e647b7330d3
parentb2668c85e9d3745847f716f909ba4d3f6de0e12e
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>
configure
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/rtpenc.c
libavformat/rtpenc.h
libavformat/rtsp.c
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale_mmx.c
libswscale/x86/yuv2rgb_mmx.c