1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer 015903294c Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
  rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
  ape: Use unsigned integer maths
  arm: dsputil: fix overreads in put/avg_pixels functions
  h264: K&R formatting cosmetics for header files (part II/II)
  h264: K&R formatting cosmetics for header files (part I/II)
  rtmp: Implement check bandwidth notification.
  rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
  rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
  rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
  cmdutils: Add fallback case to switch in check_stream_specifier().
  sctp: be consistent with socket option level
  configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
  vcr1enc: drop pointless empty encode_init() wrapper function
  vcr1: drop pointless write-only AVCodecContext member from VCR1Context
  vcr1: group encoder code together to save #ifdefs
  vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
  mov: make one comment slightly more specific
  lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX
  lavfi: move audio-related functions to a separate file.
  lavfi: remove some audio-related function from public API.
  ...

Conflicts:
	cmdutils.c
	libavcodec/h264.h
	libavcodec/h264_mvpred.h
	libavcodec/vcr1.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-10 23:30:42 +02:00
..
aac.h
aacpsdsp_init_arm.c aacps: NEON optimisations 2012-05-05 22:04:21 +01:00
aacpsdsp_neon.S aacps: NEON optimisations 2012-05-05 22:04:21 +01:00
ac3dsp_arm.S
ac3dsp_armv6.S
ac3dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
ac3dsp_neon.S
asm-offsets.h
asm.S Merge remote-tracking branch 'qatar/master' 2012-04-26 22:24:58 +02:00
dca.h
dcadsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
dcadsp_neon.S
dsputil_arm.h Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
dsputil_arm.S
dsputil_armv6.S
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 lowres2 support. 2012-04-22 22:26:55 +02:00
dsputil_init_neon.c lowres2 support. 2012-04-22 22:26:55 +02:00
dsputil_init_vfp.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
dsputil_neon.S Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
dsputil_vfp.S
fft_fixed_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
fft_fixed_neon.S
fft_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
fft_neon.S
fmtconvert_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
fmtconvert_neon.S
fmtconvert_vfp.S
h264cmc_neon.S
h264dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
h264dsp_neon.S
h264idct_neon.S
h264pred_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
h264pred_neon.S
int_neon.S Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
jrevdct_arm.S
Makefile aacps: NEON optimisations 2012-05-05 22:04:21 +01:00
mathops.h
mdct_fixed_neon.S
mdct_neon.S
mpegaudiodsp_fixed_armv6.S
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
mpegvideo_armv5te.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegvideo_neon.S
neon.S
rdft_neon.S
rv34dsp_init_neon.c rv34: change most "int stride" into "ptrdiff_t stride". 2012-02-20 14:58:25 -08:00
rv34dsp_neon.S
rv40dsp_init_neon.c rv40dsp: implement prescaled versions for biweight. 2012-04-10 10:06:48 -07:00
rv40dsp_neon.S
sbrdsp_init_arm.c ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
sbrdsp_neon.S
simple_idct_arm.S
simple_idct_armv5te.S
simple_idct_armv6.S
simple_idct_neon.S
synth_filter_neon.S
vp3dsp_neon.S
vp8_armv6.S Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vp8.h Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
vp8dsp_armv6.S vp8: armv6: fix non-armv6t2 build 2012-04-25 23:16:31 +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 vp8: arm: separate ARMv6 functions from NEON 2012-04-25 21:41:39 +01:00
vp8dsp.h vp8: arm: separate ARMv6 functions from NEON 2012-04-25 21:41:39 +01:00
vp56_arith.h
vp56dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
vp56dsp_neon.S