1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer cabbd271a5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
  flvdec: remove incomplete, disabled seeking code
  mem: add support for _aligned_malloc() as found on Windows
  lavc: Extend the documentation for avcodec_init_packet
  flvdec: remove incomplete, disabled seeking code
  http: replace atoll() with strtoll()
  mpegts: remove unused/incomplete/broken seeking code
  af_amix: allow float planar sample format as input
  af_amix: use AVFloatDSPContext.vector_fmac_scalar()
  float_dsp: add x86-optimized functions for vector_fmac_scalar()
  float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil
  lavr: Add x86-optimized function for flt to s32 conversion
  lavr: Add x86-optimized function for flt to s16 conversion
  lavr: Add x86-optimized functions for s32 to flt conversion
  lavr: Add x86-optimized functions for s32 to s16 conversion
  lavr: Add x86-optimized functions for s16 to flt conversion
  lavr: Add x86-optimized function for s16 to s32 conversion
  rtpenc: Support packetizing iLBC
  rtpdec: Add a depacketizer for iLBC
  Implement the iLBC storage file format
  mov: Support muxing/demuxing iLBC
  ...

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/dsputil.c
	libavcodec/version.h
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/version.h
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-19 20:53:27 +02:00
..
aac.h
aacpsdsp_init_arm.c
aacpsdsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_arm.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_armv6.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
ac3dsp_init_arm.c
ac3dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
asm-offsets.h
dca.h
dcadsp_init_arm.c
dcadsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_arm.h
dsputil_arm.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_armv6.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_init_arm.c
dsputil_init_armv5te.c
dsputil_init_armv6.c
dsputil_init_neon.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
dsputil_init_vfp.c Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
dsputil_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fft_fixed_init_arm.c
fft_fixed_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fft_init_arm.c
fft_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fmtconvert_init_arm.c
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
fmtconvert_vfp.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264cmc_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
h264dsp_init_arm.c
h264dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264idct_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
h264pred_init_arm.c
h264pred_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
int_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
jrevdct_arm.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
Makefile
mathops.h
mdct_fixed_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
mdct_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
mpegaudiodsp_fixed_armv6.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
mpegaudiodsp_init_arm.c
mpegvideo_arm.c
mpegvideo_arm.h
mpegvideo_armv5te_s.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
mpegvideo_armv5te.c
mpegvideo_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
neon.S
rdft_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
rv34dsp_init_neon.c
rv34dsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
rv40dsp_init_neon.c
rv40dsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
sbrdsp_init_arm.c
sbrdsp_neon.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
simple_idct_armv5te.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
simple_idct_armv6.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
simple_idct_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
synth_filter_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp3dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp8_armv6.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp8.h
vp8dsp_armv6.S ARM: Move asm.S from libavcodec to libavutil 2012-06-08 13:14:38 -04:00
vp8dsp_init_arm.c
vp8dsp_init_armv6.c
vp8dsp_init_neon.c
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
vp8dsp.h
vp56_arith.h
vp56dsp_init_arm.c
vp56dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00