1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavutil/arm
Michael Niedermayer 406cdddbdd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libx264: add forgotten ;
  matroskadec: fix a sanity check.
  matroskadec: only return corrupt packets that actually contain data
  lavf: zero data/size of the packet passed to read_packet().
  ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
  ARM: align PIC offset pools to 4 bytes
  ARM: swap source operands in some add instructions
  configure: update tms470 detection for latest version
  lavf probe: prevent codec probe with no data at all seen
  motion_est: fix use of inline on extern functions

Conflicts:
	libavcodec/motion_est_template.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21 14:44:32 +02:00
..
asm.S Merge remote-tracking branch 'qatar/master' 2012-09-21 14:44:32 +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 Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2012-08-09 00:51:02 +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