Merge pull request #4081 from voguemaster/master
authorJoakim Plate <elupus@ecce.se>
Fri, 24 Jan 2014 19:21:55 +0000 (11:21 -0800)
committerJoakim Plate <elupus@ecce.se>
Fri, 24 Jan 2014 19:21:55 +0000 (11:21 -0800)
commitbe0ee21e47817cddc9fb20b48e7510203c597fed
tree0f66e80da75e26586163fc9705440e9420820ee6
parent6d34f22b3cb08b0d9ef06d1d02b5529395605dac
parent1299a912ec0fb3b76116521fd82c6a777f27b84a
Merge pull request #4081 from voguemaster/master

ffmpeg: Correctly handle cookies that specify a sub-domain.