[FFmpeg-cvslog] Merge commit '89564be444d24f75ea5add8b6987e414cf7aa7d5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 04:20:47 2014 +0100| [1c7d2870440fcf3c11dadb8b060cc8ee0ffeafc5] | committer: Michael Niedermayer

Merge commit '89564be444d24f75ea5add8b6987e414cf7aa7d5'

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

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

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