Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'
authorClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 13:17:59 +0000 (15:17 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 13:17:59 +0000 (15:17 +0200)
commit72dbfe42efcb0e0c397ec879c7868861083c5286
tree58419637a7900d8feb055ac4d17c5775b856dc39
parenta51867ee6bc717a54ea2436e31ee626f02fdf25d
parentf4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6
Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'

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

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