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)
commitc3a62d3507b231f4ac8cb17eb537024b8c497bc9
treedfae224cba2ced8b0e3b951a83806bdeb0e268c9
parent5d7009dac28bd448313e3d04327b2cb00446dc83
parentd46d87d1d3de41758b08c045d4b20f4b16ad21de
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/sparc/dsputil_vis.c