Merge commit '441e8ae5efd681055e5af6f4317fb60110de9dd0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jun 2015 09:48:31 +0000 (11:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jun 2015 09:48:49 +0000 (11:48 +0200)
commit3d2267019cd7ba318d01babc14fdc82ab5496a7c
tree11566861ed714be836c312276d3931cbc62ede51
parentfb2eeebf662ef3f3b0600da8471b3ff120afb652
parent441e8ae5efd681055e5af6f4317fb60110de9dd0
Merge commit '441e8ae5efd681055e5af6f4317fb60110de9dd0'

* commit '441e8ae5efd681055e5af6f4317fb60110de9dd0':
  FATE: drop the last truncated frame from the wmapro tests

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