1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavcodec/ppc
Michael Niedermayer 3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
	libavcodec/dvenc.c
	libavcodec/error_resilience.c
	libavcodec/h264.h
	libavcodec/h264_slice.c
	libavcodec/me_cmp.c
	libavcodec/me_cmp.h
	libavcodec/motion_est.c
	libavcodec/motion_est_template.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 23:27:40 +02:00
..
asm.S
audiodsp.c
blockdsp.c
fdctdsp.c
fdctdsp.h
fft_altivec_s.S
fft_altivec.c
fft_vsx.c
fft_vsx.h
fmtconvert_altivec.c
h264chroma_init.c
h264chroma_template.c
h264dsp.c
h264qpel_template.c
h264qpel.c
hpeldsp_altivec.c
hpeldsp_altivec.h
huffyuvdsp_altivec.c
idctdsp.c
lossless_audiodsp_altivec.c
Makefile Merge commit '2d60444331fca1910510038dd3817bea885c2367' 2014-07-17 23:27:40 +02:00
mathops.h
me_cmp.c Merge commit '2d60444331fca1910510038dd3817bea885c2367' 2014-07-17 23:27:40 +02:00
mpegaudiodsp_altivec.c
mpegvideo_altivec.c
mpegvideodsp.c
mpegvideoencdsp.c
pixblockdsp.c
svq1enc_altivec.c
vc1dsp_altivec.c
videodsp_ppc.c
vorbisdsp_altivec.c
vp3dsp_altivec.c
vp8dsp_altivec.c