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)
* commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb':
  movenc: Write pts timestamps in tfxd, instead of dts timestamps

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

Simple merge