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)
* commit '89564be444d24f75ea5add8b6987e414cf7aa7d5':
  rtmpproto: Send a full, absolute timestamp if it isn't monotonically growing

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

Simple merge