Michael Niedermayer 2684d2e3ea Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b' ...

* commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b':
  dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
  aacenc: use the correct output buffer
  aacdec: fix signed overflows in lcg_random()
  base64: fix signed overflow in shift

Conflicts:
	libavcodec/dsputil.c
	libavutil/base64.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-11-27 13:39:52 +01:00

..

aac.h

…

aacpsdsp_init_arm.c

aacps: NEON optimisations

2012-05-05 22:04:21 +01:00

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: swap source operands in some add instructions

2012-09-20 17:07:18 +01:00

ac3dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

ac3dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

asm-offsets.h

…

dca.h

arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb

2012-09-16 19:06:11 +02:00

dcadsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

dcadsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

dsputil_arm.h

Merge remote-tracking branch 'qatar/master'

2012-03-13 01:56:33 +01:00

dsputil_arm.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

dsputil_armv6.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

dsputil_init_arm.c

lowres2 support.

2012-04-22 22:26:55 +02:00

dsputil_init_armv5te.c

lowres2 support.

2012-04-22 22:26:55 +02:00

dsputil_init_armv6.c

dsputil/me/pixels: Actually use av_restrict

2012-09-09 03:55:56 +02:00

dsputil_init_neon.c

Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'

2012-11-27 13:39:52 +01:00

dsputil_init_vfp.c

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

dsputil_neon.S

Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'

2012-11-27 13:39:52 +01:00

dsputil_vfp.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

fft_fixed_init_arm.c

Fix misspellings of FFmpeg

2012-07-19 18:44:46 +02:00

fft_fixed_neon.S

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

fft_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

fft_neon.S

Merge remote-tracking branch 'qatar/master'

2012-07-01 22:43:09 +02:00

flacdsp_arm.S

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

flacdsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-09-16 14:55:00 +02:00

fmtconvert_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

fmtconvert_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

fmtconvert_vfp.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

h264cmc_neon.S

ARM: fix overreads in neon h264 chroma mc

2012-10-20 01:28:38 +01:00

h264dsp_init_arm.c

arm: fix compile with disable-optimizations on android

2012-08-07 13:31:40 +02:00

h264dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

h264idct_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

h264pred_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01:00

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-10-03 13:35:02 +02:00

jrevdct_arm.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

Makefile

arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)

2012-10-10 15:28:50 +02:00

mathops.h

Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

2012-10-12 14:26:46 +02:00

mdct_fixed_neon.S

ARM: set Tag_ABI_align_preserved in all asm files

2012-10-02 19:47:56 +01:00

mdct_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +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

ARM: allow runtime masking of CPU features

2012-04-22 12:30:45 +01:00

mpegvideo_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-22 22:26:42 +02:00

mpegvideo_arm.h

Merge remote-tracking branch 'qatar/master'

2012-03-13 01:56:33 +01:00

mpegvideo_armv5te_s.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

mpegvideo_armv5te.c

mpegvideo_armv5te: change asserts to av_asserts

2012-10-06 04:45:57 +02:00

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-10-03 13:35:02 +02:00

rv34dsp_init_arm.c

Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

2012-10-11 14:03:12 +02:00

rv34dsp_neon.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

rv40dsp_init_arm.c

Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

2012-10-11 14:03:12 +02:00

rv40dsp_neon.S

ARM: Move asm.S from libavcodec to libavutil

2012-06-08 13:14:38 -04:00

sbrdsp_init_arm.c

ARM: allow runtime masking of CPU features

2012-04-22 12:30:45 +01:00

sbrdsp_neon.S

ARM: generate position independent code to access data symbols

2012-07-01 11:25:06 +01:00

simple_idct_arm.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

simple_idct_armv5te.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

simple_idct_armv6.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

simple_idct_neon.S

Merge remote-tracking branch 'qatar/master'

2012-08-01 23:33:06 +02:00

synth_filter_neon.S

Merge remote-tracking branch 'qatar/master'

2012-10-03 13:35:02 +02:00

vp3dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-07-18 22:34:48 +02:00

vp3dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-07-18 22:34:48 +02:00

vp8_armv6.S

Merge remote-tracking branch 'qatar/master'

2012-09-21 14:44:32 +02:00

vp8.h

…

vp8dsp_armv6.S

ARMv6: vp8: fix stack allocation with Apple's assembler

2012-08-04 00:59:14 +01:00

vp8dsp_init_arm.c

Merge remote-tracking branch 'qatar/master'

2012-04-26 22:24:58 +02:00

vp8dsp_init_armv6.c

vp8: armv6 optimisations

2012-04-25 21:41:39 +01:00

vp8dsp_init_neon.c

vp8: arm: separate ARMv6 functions from NEON

2012-04-25 21:41:39 +01:00

vp8dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00

vp8dsp.h

vp8: arm: separate ARMv6 functions from NEON

2012-04-25 21:41:39 +01:00

vp56_arith.h

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

vp56dsp_init_arm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

vp56dsp_neon.S

Merge remote-tracking branch 'qatar/master'

2012-06-08 23:59:09 +02:00