Merge commit 'd7eb8f903338048c0b222d92357d67f5d3b54295'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Apr 2014 18:38:14 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Apr 2014 18:38:30 +0000 (20:38 +0200)
commitecb815e5117f3353ed3e67bb737029773d170212
tree8595e82100748d74bdb39939ee92cbf91d34140c
parent14da7f9eb7d74524ef29ba6b7fb478720a00137f
parentd7eb8f903338048c0b222d92357d67f5d3b54295
Merge commit 'd7eb8f903338048c0b222d92357d67f5d3b54295'

* commit 'd7eb8f903338048c0b222d92357d67f5d3b54295':
  fic: Make warning message more accurate
  fic: Remove redundant clips
  fic: Simplify alpha blending

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