Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:38:47 +0000 (12:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Mar 2015 11:38:51 +0000 (12:38 +0100)
commit4631d4bec37cfa6a86693684af7d0f73be7021cb
tree6276253361a460a2306ef7a2bc9c71904af91ae3
parent00ad3432e1d80ef73cd9aea3c3b5028aeaad84b6
parent5cf892d6946b19a87bcd00d6b76ce81f45960fdb
Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'

* commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb':
  movenc: Write pts timestamps in tfxd, instead of dts timestamps

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