• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 32c30387
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    32c30387
mpegenc.c 40.4 KB