OSDN Git Service

Merge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:42:48 +0000 (16:42 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:42:48 +0000 (16:42 +0200)
commite78dc57888d1468b4f156581ec7039d2eda91783
tree4de82f4d8a28ae197038123a7bc297a493e7b3b2
parent1ff55e12f7298322c463a2fbb422cfeac9bbbe67
parent11e225db31dcad57e2219ad8dfae2ac027af53d6
Merge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'

* commit '11e225db31dcad57e2219ad8dfae2ac027af53d6':
  rtmp: Account for bytes_read wraparound

This commit is a noop, see 0849a0ebb2c94856c3a94cb114a1412e44904c28

Merged-by: Clément Bœsch <u@pkh.me>