Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:37:31 +0000 (16:37 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:37:31 +0000 (16:37 +0100)
commitddcd396075df5134491bc128c41c034898291cdb
tree8bab38b94007d53911f0eaa7b53652df9aa8e2f4
parentd1c341f77b0196947027c8a918b93a187c5dc860
parent9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56
Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'

* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56':
  rtmpproto: Don't include the libavformat version as "clientid"

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