Merge pull request #2730 from ulion/dvdplayer_ffmpeg_http_protocol_options
authorArne Morten Kvarving <spiff@xbmc.org>
Sat, 8 Jun 2013 17:17:39 +0000 (10:17 -0700)
committerArne Morten Kvarving <spiff@xbmc.org>
Sat, 8 Jun 2013 17:17:39 +0000 (10:17 -0700)
commitbfb8e9832d56f4b512828f9f659df9fcac40724c
tree26249c17f3a12373aa10b381677e2c571b2d4c1a
parentd996d041bc8cde2b89fedd9d00a83a1ec99c2b79
parenta837a0e39c9915b751464b8bb7c7be7028196d81
Merge pull request #2730 from ulion/dvdplayer_ffmpeg_http_protocol_options

[DVDPlayer] ffmpeg support http/https protocol options, also fix #14309.
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h