Merge commit '89564be444d24f75ea5add8b6987e414cf7aa7d5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:20:47 +0000 (04:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:20:50 +0000 (04:20 +0100)
commit1c7d2870440fcf3c11dadb8b060cc8ee0ffeafc5
treeb7273dc205002a9e0b9515b268ae6affdeee05fb
parentca9d7c57f4b0fde0f1558b44a7bd6c80028b74be
parent89564be444d24f75ea5add8b6987e414cf7aa7d5
Merge commit '89564be444d24f75ea5add8b6987e414cf7aa7d5'

* commit '89564be444d24f75ea5add8b6987e414cf7aa7d5':
  rtmpproto: Send a full, absolute timestamp if it isn't monotonically growing

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