1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavutil/arm
Michael Niedermayer 86e107a7d4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cosmetics: Consistently use C-style comments with multiple inclusion guards
  anm: fix a few Doxygen comments
  misc typo and wording fixes
  attributes: add av_noreturn
  attributes: drop pointless define guards
  configure: do not disable av_always_inline with --enable-small
  flvdec: initial stream switch support
  avplay: fix write on freed memory for rawvideo
  snow: remove a VLA used for edge emulation
  x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
  snow: remove the runs[] VLA.
  snow: Check mallocs at init
  flacdec: remove redundant setting of avctx->sample_fmt

Conflicts:
	ffplay.c
	libavcodec/h264.c
	libavcodec/snow.c
	libavcodec/snow.h
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavformat/flvdec.c
	libavutil/attributes.h
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-04 00:32:31 +02:00
..
asm.S Merge remote-tracking branch 'qatar/master' 2012-07-01 22:43:09 +02:00
bswap.h
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-07-04 00:32:31 +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