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)
commita7d451c1dd754c6345dfaa0d2416f1adba20ef08
tree7ec3051bdfe8c7f3bc191cf8c14a39d6f0d878a8
parentff9b21776b8d944838b3698f529447d287fe4ed0
parente1ee0521a698809ed216e9e5c11bd2bbb466ed04
Merge remote-tracking branch 'github/master'

* github/master:
  tests: Fix test name for pixfmts tests

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