Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 17:15:29 +0000 (18:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 17:15:29 +0000 (18:15 +0100)
commit1e7a92f219a8e245128773491346d64c1e6c85fa
tree45b9df7bd1bab1b34920165d20802068d3f37bf1
parentf900fd5d31dcabc138a0f96511ddbf8e9a279765
parentbaf35bb4bc4fe7a2a4113c50989d11dd9ef81e76
Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'

* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

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/dsputil.c
libavcodec/dsputil.h
libavcodec/sh4/dsputil_align.c
libavcodec/sparc/dsputil_vis.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_mmx.c