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)
* commit '7ce3bd9614717e545af8fb8455032c807e389b78':
  rtmpproto: Support alternative slist parameter in rtmp URLs

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

Simple merge