Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 16:52:21 +0000 (17:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 16:52:21 +0000 (17:52 +0100)
commit6d1e9d993a5559ca5c4a578fce499c74528fe8d1
treee0bb88a7451876b192ef4254a6e3320ff75d260c
parentac8987591f5503768e7587c25693928f26fcb3d1
parent32ff6432284f713e9f837ee5b36fc8e9f1902836
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

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

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/alpha/dsputil_alpha.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/sh4/dsputil_align.c
libavcodec/sparc/dsputil_vis.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_rnd_template.c