Michael Niedermayer 2904d052b7 Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac' ...

* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
  qpeldsp: Mark source pointer in qpel_mc_func function pointer const

Conflicts:
	libavcodec/h264qpel_template.c
	libavcodec/x86/cavsdsp.c
	libavcodec/x86/rv40dsp_init.c

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

2014-07-25 13:05:08 +02:00

..

asm.S

…

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

dct-test.c

Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'

2014-07-21 13:33:51 +02:00

fdct.h

Merge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'

2014-07-19 14:10:25 +02:00

fdctdsp.c

Merge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'

2014-07-19 14:10:25 +02: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

Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'

2014-07-25 13:05:08 +02:00

h264qpel.c

Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'

2014-07-25 13:05:08 +02:00

hpeldsp_altivec.c

Merge commit '27860819d508068f056cf48473af04868791ad77'

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

hpeldsp_altivec.h

…

huffyuvdsp_altivec.c

Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'

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

idctdsp.c

Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'

2014-07-18 22:16:04 +02:00

lossless_audiodsp_altivec.c

Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'

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

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

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

mpegvideoencdsp.c

Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'

2014-07-07 15:36:58 +02:00

pixblockdsp.c

Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

2014-07-10 01:22:14 +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