1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/arm
Michael Niedermayer 6cb2085278 Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-16 01:34:37 +01:00
..
aac.h
ac3dsp_arm.S
ac3dsp_armv6.S ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6 2012-02-02 18:50:42 +00:00
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' 2012-01-14 02:22:09 +01:00
dca.h ARM: dca: disable optimised decode_blockcodes() for old gcc 2011-12-15 01:02:58 +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 Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-21 01:33:31 +01:00
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
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' 2012-01-29 00:34:59 +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 Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegvideo_arm.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegvideo_armv5te_s.S
mpegvideo_armv5te.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
mpegvideo_iwmmxt.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
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: add NEON rv34_idct_add 2012-01-16 19:26:41 +01:00
rv34dsp_neon.S rv34: add NEON rv34_idct_add 2012-01-16 19:26:41 +01:00
rv40dsp_init_neon.c rv40: NEON optimised weak loop filter 2011-12-16 14:36:01 +00:00
rv40dsp_neon.S rv40: NEON optimised weak loop filter 2011-12-16 14:36:01 +00:00
sbrdsp_init_arm.c aacsbr: ARM NEON optimised sbrdsp functions 2012-01-28 14:56:18 +00:00
sbrdsp_neon.S aacsbr: ARM NEON optimised sbrdsp functions 2012-01-28 14:56:18 +00:00
simple_idct_arm.S Merge remote-tracking branch 'qatar/master' 2012-01-14 02:22:09 +01:00
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
vp8dsp_init_arm.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vp8dsp_neon.S Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
vp56_arith.h
vp56dsp_init_arm.c
vp56dsp_neon.S