1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer 3ba0bfe71f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 23:21:37 +01:00
..
aac.h
ac3dsp_arm.S
ac3dsp_armv6.S
ac3dsp_init_arm.c Merge remote-tracking branch 'mans/ac3' 2011-10-22 11:11:08 +02:00
ac3dsp_neon.S
asm-offsets.h Merge remote-tracking branch 'qatar/master' 2011-10-24 01:01:21 +02:00
asm.S Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
dca.h dca: ARMv6 optimised decode_blockcode() 2011-11-25 13:19:53 +00:00
dcadsp_init_arm.c
dcadsp_neon.S
dsputil_arm.h
dsputil_arm.S
dsputil_armv6.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
dsputil_init_arm.c
dsputil_init_armv5te.c
dsputil_init_armv6.c
dsputil_init_neon.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
dsputil_init_vfp.c
dsputil_iwmmxt_rnd_template.c
dsputil_iwmmxt.c
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
dsputil_vfp.S
fft_fixed_init_arm.c
fft_fixed_neon.S
fft_init_arm.c
fft_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fmtconvert_init_arm.c
fmtconvert_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fmtconvert_vfp.S
h264cmc_neon.S rv40: NEON optimised chroma MC 2011-12-06 13:48:25 +00:00
h264dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
h264dsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-12-07 02:04:00 +01:00
h264idct_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
h264pred_init_arm.c h264: 4:2:2 intra decoding support 2011-10-21 01:00:41 -07:00
h264pred_neon.S
int_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
jrevdct_arm.S
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-07 02:04:00 +01:00
mathops.h
mdct_fixed_neon.S
mdct_neon.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
mpegaudiodsp_fixed_armv6.S
mpegaudiodsp_init_arm.c
mpegvideo_arm.c
mpegvideo_arm.h
mpegvideo_armv5te_s.S
mpegvideo_armv5te.c
mpegvideo_iwmmxt.c
mpegvideo_neon.S
neon.S ARM: make some NEON macros reusable 2011-12-02 19:59:18 +00:00
rdft_neon.S
rv34dsp_init_neon.c rv34: NEON optimised 4x4 dequant 2011-12-13 12:06:21 +00:00
rv34dsp_neon.S rv34: NEON optimised 4x4 dequant 2011-12-13 12:06:21 +00:00
rv40dsp_init_neon.c rv40: NEON optimised rv40 qpel motion compensation 2011-12-07 22:38:14 +00:00
rv40dsp_neon.S rv40: NEON optimised rv40 qpel motion compensation 2011-12-07 22:38:14 +00:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
simple_idct_armv5te.S
simple_idct_armv6.S
simple_idct_neon.S
synth_filter_neon.S
vp3dsp_neon.S
vp8_armv6.S
vp8.h
vp8dsp_armv6.S VP8: armv6 optimizations. 2011-10-03 01:49:36 +02:00
vp8dsp_init_arm.c VP8: armv6 optimizations. 2011-10-03 01:49:36 +02:00
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01:00
vp56_arith.h
vp56dsp_init_arm.c
vp56dsp_neon.S