Merge branch 'brightcove_in_page_embed' of https://github.com/remitamine/youtube...

diff --cc youtube_dl/extractor/__init__.py
Simple merge

diff --cc youtube_dl/extractor/brightcove.py
Simple merge

diff --cc youtube_dl/extractor/generic.py
Simple merge

diff --cc youtube_dl/utils.py
Simple merge