projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7329c0 7395784)
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)
* commit '7395784ba72742b6daa62d35db4028e09f3fdf06':
  rtmpproto: Check the return from ff_amf_read_string

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavformat/rtmpproto.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/rtmpproto.c
Simple merge
FFmpeg git repo