
* qatar/master: sparc: dsputil_vis: Fix silly variable name search and replace typo Conflicts: libavcodec/sparc/dsputil_vis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master: sparc: dsputil_vis: Fix silly variable name search and replace typo Conflicts: libavcodec/sparc/dsputil_vis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>