Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Feb 2013 11:15:54 +0000 (12:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Feb 2013 11:15:54 +0000 (12:15 +0100)
* 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>
1  2 
libavcodec/sparc/dsputil_vis.c

Simple merge