Michael Niedermayer fc13a89654 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  dsputil: Separate h264 qpel

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/h264.c

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

2013-01-24 15:47:47 +01:00

..

asm.S

…

dsputil_altivec.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_altivec.h

…

dsputil_ppc.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

fdct_altivec.c

…

fft_altivec_s.S

…

fft_altivec.c

…

fmtconvert_altivec.c

…

gmc_altivec.c

…

h264_altivec.c

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

h264_qpel_template.c

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

h264_qpel.c

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

idct_altivec.c

…

int_altivec.c

…

Makefile

dsputil: Separate h264 qpel

2013-01-24 10:44:43 +01:00

mathops.h

…

mpegaudiodec_altivec.c

…

mpegvideo_altivec.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vc1dsp_altivec.c

Merge remote-tracking branch 'qatar/master'

2013-01-24 15:47:47 +01:00

videodsp_ppc.c

…

vorbisdsp_altivec.c

…

vp3dsp_altivec.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vp8dsp_altivec.c

…