Merge commit '64f8c439fd663fec4d57ac21af572d498fe21f7a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:21:32 +0000 (17:21 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 16:21:32 +0000 (17:21 +0100)
* commit '64f8c439fd663fec4d57ac21af572d498fe21f7a':
  rtmpproto: Include the full path as app when "slist=" is found

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/rtmpproto.c

Simple merge