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

ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

2013-04-19 23:18:59 +03:00

dsputil_altivec.h

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

2013-02-07 13:09:35 +01:00

dsputil_ppc.c

dsputil: remove deprecated dsp_mask usage

2013-03-13 15:59:35 +01:00

fdct_altivec.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

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

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

h264chroma_init.c

Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'

2013-05-01 18:02:36 +02:00

h264chroma_template.c

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

2013-02-07 13:09:35 +01:00

h264dsp.c

Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'

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

h264qpel_template.c

Merge commit '6b110d3a739c31602b59887ad65c67025df3f49d'

2013-05-01 17:53:33 +02:00

h264qpel.c

Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'

2013-05-01 18:02:36 +02:00

hpeldsp_altivec.c

Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'

2013-05-01 18:02:36 +02:00

idct_altivec.c

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

2013-02-26 13:05:10 +01:00

int_altivec.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

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

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

vorbisdsp_altivec.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

vp3dsp_altivec.c

Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'

2013-05-01 18:02:36 +02:00

vp8dsp_altivec.c

Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'

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