Merge remote-tracking branch 'github/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Nov 2014 10:25:08 +0000 (11:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Nov 2014 10:25:29 +0000 (11:25 +0100)
* github/master:
  tests: Fix test name for pixfmts tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge