1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/ppc
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
..
asm.S
dsputil_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputil_altivec.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dsputil_ppc.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
fdct_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
fft_altivec_s.S
fft_altivec.c
float_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
fmtconvert_altivec.c
gmc_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
h264_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
h264_template_altivec.c
idct_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
int_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
Makefile
mathops.h
mpegaudiodec_altivec.c
mpegvideo_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
regs.h
types_altivec.h
util_altivec.h
vc1dsp_altivec.c
vp3dsp_altivec.c
vp8dsp_altivec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00