Michael Niedermayer 6d1e9d993a Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836' ...

* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

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

2013-01-23 17:52:21 +01:00

..

asm.h

…

dsputil_alpha_asm.S

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

dsputil_alpha.c

Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

2013-01-23 17:52:21 +01:00

dsputil_alpha.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

Makefile

build: non-x86: Only compile mpegvideo optimizations when necessary

2012-10-09 14:45:59 +02:00

motion_est_alpha.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

motion_est_mvi_asm.S

…

mpegvideo_alpha.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

regdef.h

…

simple_idct_alpha.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00