Merge commit 'a2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d'
authorMark Thompson <sw@jkqxz.net>
Thu, 25 Jan 2018 22:48:34 +0000 (22:48 +0000)
committerMark Thompson <sw@jkqxz.net>
Thu, 25 Jan 2018 22:48:34 +0000 (22:48 +0000)
commitb855b570c811d208bfadeb4e140bee90c1598e72
tree9b350198ec3ac4bd32530b0425cce2663725d800
parent8e9be8ffba03d3327ca1aaf0b1a5f3e2458ea285
parenta2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d
Merge commit 'a2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d'

* commit 'a2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d':
  rtmp: Plug leak if sending bytes read report fails.

This commit is a noop, see ee88f31d34c848fd95daf12bdf054b7228efdf14

Merged-by: Mark Thompson <sw@jkqxz.net>