Merge pull request #1152 from micahg/master
authorArne Morten Kvarving <spiff@xbmc.org>
Tue, 7 Aug 2012 09:34:22 +0000 (02:34 -0700)
committerArne Morten Kvarving <spiff@xbmc.org>
Tue, 7 Aug 2012 09:34:22 +0000 (02:34 -0700)
commit8f043b4a1f06a6c2d27373d4bcb4194cdaeff40f
tree055335c3d291e6258767d87b91e7947423767dcd
parentaeef095f5590e3f4ba658089a19d02d3d8ae90c9
parent6823a104a34ca31496da2177df23bd113a8b52d9
Merge pull request #1152 from micahg/master

Enable HLS passthrough to FFMPEG
xbmc/cores/dvdplayer/DVDPlayer.cpp