Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 01:01:31 +0000 (03:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 01:01:35 +0000 (03:01 +0200)
commit178764e833b14513ca4aaffa83f3d8444759a6ee
tree16b7f47b3d55a7db7b8b234d9e757c8b19f960d7
parente06263ef1e0e172b2c76070b3dc739411af08e82
parentf4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467
Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'

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

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