Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:34:19 +0000 (16:34 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:34:19 +0000 (16:34 +0100)
commit36fcbc00765aa9f5e89c10bdeab744ecae153f37
tree855b1836d9b2c095fea08dd07bf2564eabc361d3
parente7329c0fd55cc88f7b78b842a8bce201f0e49fdb
parent7395784ba72742b6daa62d35db4028e09f3fdf06
Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'

* commit '7395784ba72742b6daa62d35db4028e09f3fdf06':
  rtmpproto: Check the return from ff_amf_read_string

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