Merge commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:34:53 +0000 (09:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:34:53 +0000 (09:34 +0200)
commit4b6ccccb03ba23ddf5478235fb7bae2d1fe3e952
tree038b168b4110c697fe838d04ead67917e3fcc06a
parent316825f3e9d5f27ed31650928daba3f18bf06600
parent58c3720a3cc71142b5d48d8ccdc9213f9a66cd33
Merge commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33'

* commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33':
  fate: Make sure a corner-case for ASF is covered

Adjusted fate ref to match the different timebase of the ffasf demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tests/fate/microsoft.mak
tests/ref/fate/asf-repldata