1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavutil/arm
Michael Niedermayer e847f41285 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libspeexenc: add supported sample rates and channel layouts.
  Replace usleep() calls with av_usleep()
  lavu: add av_usleep() function
  utvideo: mark interlaced frames as such
  utvideo: Fix interlaced prediction for RGB utvideo.
  cosmetics: do not use full path for local headers
  lavu/file: include unistd.h only when available
  configure: check for unistd.h
  log: include unistd.h only when needed
  lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/utvideo.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22 22:34:02 +02:00
..
asm.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
bswap.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
cpu.c ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
cpu.h ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
float_dsp_arm.h Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
float_dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
float_dsp_init_neon.c float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil 2012-06-18 18:01:14 -04:00
float_dsp_init_vfp.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
float_dsp_neon.S float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil 2012-06-18 18:01:14 -04:00
float_dsp_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
intmath.h arm/intmath: disable av_clip_uintp2_arm with config_small 2012-06-12 23:05:47 +02:00
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2012-05-05 00:54:28 +02:00
Makefile Add a float DSP framework to libavutil 2012-06-08 13:14:38 -04:00
timer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00