Merge commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 20:16:01 +0000 (22:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 20:16:54 +0000 (22:16 +0200)
commit802c0af68f22b0c3cd4ad3d29f5094e9377995de
tree64f1d91ebd8974a383a66d17cefd9c6a77465d13
parent8d31b22869f6a676fe4d1e34d74c0fa3b081421c
parent358b7ec3099eca6e999ad9dc0da0a23571a7a2f8
Merge commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8'

* commit '358b7ec3099eca6e999ad9dc0da0a23571a7a2f8':
  fate: Fix test name for pixfmts tests

Conflicts:
tests/fate-run.sh

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