[FFmpeg-cvslog] Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 03:01:31 2014 +0200| [178764e833b14513ca4aaffa83f3d8444759a6ee] | committer: Michael Niedermayer

Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'

* commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467':
  rtmpproto: Track last received timestamp

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

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