From: Clément Bœsch <u@pkh.me>
Date: Wed, 29 Mar 2017 13:17:59 +0000 (+0200)
Subject: Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'
X-Git-Tag: n3.4-dev~177
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/72dbfe42efcb0e0c397ec879c7868861083c5286

Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'

* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6':
  rtmpproto: Restructure zlib code to avoid unreachable code warning

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

72dbfe42efcb0e0c397ec879c7868861083c5286