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

* qatar/master:
  id3v2: K&R formatting cosmetics
  ppc: Only compile AltiVec FFT assembly when AltiVec is enabled

Conflicts:
	libavformat/id3v2.c

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

2013-05-02 12:49:23 +02:00

..

asm.S

…

dsputil_altivec.c

…

dsputil_altivec.h

…

dsputil_ppc.c

…

fdct_altivec.c

…

fft_altivec_s.S

…

fft_altivec.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

fmtconvert_altivec.c

Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'

2013-05-01 18:08:13 +02:00

gmc_altivec.c

…

h264chroma_init.c

…

h264chroma_template.c

…

h264dsp.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

2013-05-01 18:21:35 +02:00

h264qpel_template.c

…

h264qpel.c

…

hpeldsp_altivec.c

…

idct_altivec.c

…

int_altivec.c

…

Makefile

ppc: Only compile AltiVec FFT assembly when AltiVec is enabled

2013-05-02 10:25:30 +02:00

mathops.h

…

mpegaudiodsp_altivec.c

Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'

2013-05-01 18:08:13 +02:00

mpegvideo_altivec.c

Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'

2013-05-01 18:08:13 +02:00

vc1dsp_altivec.c

Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'

2013-05-01 18:08:13 +02:00

videodsp_ppc.c

…

vorbisdsp_altivec.c

…

vp3dsp_altivec.c

…

vp8dsp_altivec.c

Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'

2013-05-01 18:08:13 +02:00