Merge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:35:17 +0000 (16:35 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:35:17 +0000 (16:35 +0100)
* commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe':
  rtmpproto: Lengthen the filename buffer when receiving streams

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

Simple merge