RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
48,029 Commits 36 Branches 392 Tags 309 MiB
Commit Graph

4 Commits

Author SHA1 Message Date
Michael Niedermayer 509f502902 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>
 2012-09-14 14:13:38 +02:00
Mans Rullgard 8ff7857861 ARM: libavresample: NEON optimised generic fltp to s16 conversion 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-13 19:15:43 +01:00
Mans Rullgard d26de339af ARM: libavresample: NEON optimised stereo fltp to s16 conversion 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-13 19:15:43 +01:00
Mans Rullgard 643b5b794f ARM: libavresample: NEON optimised flat float to s16 conversion 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-13 19:15:42 +01:00