Michael Niedermayer d7463c6813 Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf' ...

* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
  dsputil: Split off global motion compensation bits into a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

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

2014-06-23 21:10:10 +02:00

..

asm.S

Merge commit 'd6d767d93e532246cacf3567e6bcad76a821f838'

2014-05-30 23:15:20 +02:00

audiodsp.c

Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'

2014-06-22 17:58:28 +02:00

blockdsp.c

Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

2014-06-19 04:54:38 +02:00

dsputil_altivec.c

Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

2014-06-19 04:54:38 +02:00

dsputil_altivec.h

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

2014-06-23 21:10:10 +02:00

dsputil_ppc.c

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

2014-06-23 21:10:10 +02:00

fdct_altivec.c

Merge commit '1675975216ecbea8e4826235f204dc0f4234383f'

2014-03-20 21:51:17 +01:00

fft_altivec_s.S

…

fft_altivec.c

ppc: Fix the bug of fft for little endian environment on POWER7 and later

2014-06-19 01:01:14 +02:00

fft_vsx.c

ppc: Fix the bug of fft for little endian environment on POWER7 and later

2014-06-19 01:01:14 +02:00

fft_vsx.h

ppc: Fix the bug of fft for little endian environment on POWER7 and later

2014-06-19 01:01:14 +02:00

fmtconvert_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

h264chroma_init.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

h264chroma_template.c

…

h264dsp.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

h264qpel_template.c

…

h264qpel.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

hpeldsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

hpeldsp_altivec.h

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

2014-03-22 23:17:03 +01:00

huffyuvdsp_altivec.c

Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'

2014-06-11 02:22:53 +02:00

idct_altivec.c

avcodec/ppc/idct_altivec: add plain idct()

2014-06-14 20:42:28 +02:00

lossless_audiodsp_altivec.c

Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'

2014-06-11 02:22:53 +02:00

Makefile

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

2014-06-23 21:10:10 +02:00

mathops.h

…

mpegaudiodsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

mpegvideo_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

mpegvideodsp.c

Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf'

2014-06-23 21:10:10 +02:00

svq1enc_altivec.c

Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'

2014-06-11 02:22:53 +02:00

vc1dsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

videodsp_ppc.c

…

vorbisdsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

vp3dsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00

vp8dsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

2014-06-11 02:50:50 +02:00