Merge commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Oct 2014 19:28:50 +0000 (21:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Oct 2014 19:29:10 +0000 (21:29 +0200)
* commit 'c839b0439f0b01c72a6d253920d2e342b30f8bcb':
  rtsp: Support tls when in listen mode

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

Simple merge