Michael Niedermayer fb61ed1e9f Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f' ...

* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
  On2 VP7 decoder

Conflicts:
	Changelog
	libavcodec/arm/h264pred_init_arm.c
	libavcodec/arm/vp8dsp.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/arm/vp8dsp_init_armv6.c
	libavcodec/arm/vp8dsp_init_neon.c
	libavcodec/avcodec.h
	libavcodec/h264pred.c
	libavcodec/version.h
	libavcodec/vp8.c
	libavcodec/vp8.h
	libavcodec/vp8data.h
	libavcodec/vp8dsp.c
	libavcodec/vp8dsp.h
	libavcodec/x86/h264_intrapred_init.c
	libavcodec/x86/vp8dsp_init.c

See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-04 14:46:10 +02:00

..

asm.S

…

dsputil_altivec.c

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

2014-03-20 22:36:40 +01:00

dsputil_altivec.h

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

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

dsputil_ppc.c

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

2014-03-20 22:06:01 +01:00

fdct_altivec.c

Merge commit '1675975216ecbea8e4826235f204dc0f4234383f'

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

fft_altivec_s.S

…

fft_altivec.c

Merge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1'

2014-03-20 21:09:57 +01:00

fmtconvert_altivec.c

…

gmc_altivec.c

Merge commit 'b7d24fd4b2213104c001ed504074495568600b9c'

2014-03-20 21:50:35 +01:00

h264chroma_init.c

…

h264chroma_template.c

…

h264dsp.c

…

h264qpel_template.c

…

h264qpel.c

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

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

hpeldsp_altivec.c

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

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

hpeldsp_altivec.h

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

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

idct_altivec.c

Merge commit '1675975216ecbea8e4826235f204dc0f4234383f'

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

int_altivec.c

Merge commit 'b7d24fd4b2213104c001ed504074495568600b9c'

2014-03-20 21:50:35 +01:00

Makefile

On2 VP7 decoder

2014-04-04 04:00:11 +02:00

mathops.h

…

mpegaudiodsp_altivec.c

…

mpegvideo_altivec.c

…

vc1dsp_altivec.c

Merge commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7'

2014-03-13 23:40:55 +01:00

videodsp_ppc.c

…

vorbisdsp_altivec.c

…

vp3dsp_altivec.c

…

vp8dsp_altivec.c

Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

2014-04-04 14:46:10 +02:00