• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f211d9d8
    Michael Niedermayer authored
    * qatar/master:
      build: improve rules for test programs
      build: factor out the .c and .S compile commands as a macro
      swscale: remove unused xInc/srcW arguments from hScale().
      H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
      H.264: make filter_mb_fast support 4:4:4
      mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
      configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
      Move some variable declarations below the proper #ifdefs.
    
    Conflicts:
    	Makefile
    	ffplay.c
    	libswscale/swscale.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f211d9d8
swscale.c 97.2 KB