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)
commit99f2a563889285b8be3e87fb5c5ba8c86a104785
treec02b06f6c841c8ff5af06525eab13fc15ebbc743
parenta240aefc7a2591f7b307e2910df655801ae6ca44
parent64f8c439fd663fec4d57ac21af572d498fe21f7a
Merge commit '64f8c439fd663fec4d57ac21af572d498fe21f7a'

* commit '64f8c439fd663fec4d57ac21af572d498fe21f7a':
  rtmpproto: Include the full path as app when "slist=" is found

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