• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 509f5029
    Michael Niedermayer authored
    * qatar/master:
      x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place
      trasher: Include all the necessary headers
      x86: Remove some leftover declarations for non-existent functions
      ARM: libavresample: NEON optimised generic fltp to s16 conversion
      ARM: libavresample: NEON optimised stereo fltp to s16 conversion
      ARM: libavresample: NEON optimised flat float to s16 conversion
    
    Conflicts:
    	libavcodec/x86/dsputil_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    509f5029
dsputil_mmx.c 152 KB