Merge pull request #8876 from remitamine/html5_media

author Yen Chi Hsuan <yan12125@gmail.com>

Sun, 10 Jul 2016 15:40:45 +0000 (23:40 +0800)

committer GitHub <noreply@github.com>

Sun, 10 Jul 2016 15:40:45 +0000 (23:40 +0800)
author Yen Chi Hsuan <yan12125@gmail.com>
Sun, 10 Jul 2016 15:40:45 +0000 (23:40 +0800)
committer GitHub <noreply@github.com>
Sun, 10 Jul 2016 15:40:45 +0000 (23:40 +0800)
diff --cc test/test_utils.py
Simple merge
diff --cc youtube_dl/extractor/common.py
Simple merge
diff --cc youtube_dl/utils.py
Simple merge
author	Yen Chi Hsuan <yan12125@gmail.com>
	Sun, 10 Jul 2016 15:40:45 +0000 (23:40 +0800)
committer	GitHub <noreply@github.com>
	Sun, 10 Jul 2016 15:40:45 +0000 (23:40 +0800)
		1	2
test/test_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history