Merge commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 03:26:05 +0000 (04:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 03:26:20 +0000 (04:26 +0100)
commit3be67f33a5f2fd9c08d6f0b86a3196e865484f7b
tree5c2b38ed84a82b18a73c931f33b0958bc42b9dc7
parent983778f1f68a12b1e307572f48390428c0421a8e
parent7a1a63e34fa46af18311c2493fdaec9a93bdb750
Merge commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750'

* commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750':
  dashenc: Use pts for MPD timeline timestamps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c