Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 May 2014 22:39:26 +0000 (00:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 May 2014 22:39:54 +0000 (00:39 +0200)
commitd68ed9f257bd9e76c6d615e03ba135a3df673712
tree1933e5419841c5e5cc02ca4493e0c4151725f9af
parentfc7d0d82017d67a1bbc0c1664144b756dc4ba6e3
parent7ce3bd9614717e545af8fb8455032c807e389b78
Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

* commit '7ce3bd9614717e545af8fb8455032c807e389b78':
  rtmpproto: Support alternative slist parameter in rtmp URLs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c