Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Sep 2012 12:07:21 +0000 (14:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Sep 2012 12:13:38 +0000 (14:13 +0200)
commit509f502902e3760358d5c0c189f3d288652406e5
treec577f55e9db991afa1d1aaa0df4d6626e5155b10
parent363307813e834314e85ac833dc17b4a8527c8559
parent58139e141bfd7116e527bae6a9f71c3b43fc8ff2
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dct-test.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/idct_mmx_xvid.c
libavcodec/x86/idct_xvid.h
libavresample/arm/audio_convert_init.c
libavresample/arm/audio_convert_neon.S
tools/trasher.c