baf35bb4bc
* commit 'baf35bb4bc': dsputil: remove one array dimension from avg_no_rnd_pixels_tab. Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
88bd7fdc82