Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add support for "-f mp4" for YouTube
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
AHLS -> Apple HTTP Live Streaming
Merge pull request #1341 from xanadu/master

add support for "-f mp4" for YouTube