Merge commit '58a868968df445068a143f327ced03b6a02baf0d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:03:05 +0000 (04:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:03:05 +0000 (04:03 +0100)
commit28eacd135162e34379b5c0146ad41a3601f35cd8
tree61835e7a9a60c0364efbf9a974dc83970c439a13
parentdfd11eb2a5404d2b59073ebb8433f25c51ca084b
parent58a868968df445068a143f327ced03b6a02baf0d
Merge commit '58a868968df445068a143f327ced03b6a02baf0d'

* commit '58a868968df445068a143f327ced03b6a02baf0d':
  FATE: drop the last partial frame in the wmv8-drm test

Conflicts:
tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/microsoft.mak
tests/ref/fate/wmv8-drm