[FFmpeg-cvslog] Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 19 12:38:47 2015 +0100| [4631d4bec37cfa6a86693684af7d0f73be7021cb] | committer: Michael Niedermayer

Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4631d4bec37cfa6a86693684af7d0f73be7021cb
---