RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 18:32:22 +00:00
Code Issues Projects Releases Wiki Activity
66bb5b1bc9
ffmpeg/libavresample/arm
History
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
..
audio_convert_init.c Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
audio_convert_neon.S Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
Makefile