[FFmpeg-cvslog] Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 10 21:36:08 2014 +0200| [76d1ffffd0b2433c44ac48b8939337294566218b] | committer: Michael Niedermayer

Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'

* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f':
  rtsp: Add rtsps to the probe

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76d1ffffd0b2433c44ac48b8939337294566218b
---