Merge pull request #4543 from akretz/cnn_fix

[cnn] Add support for articles with videos (fixes #4541)

diff --combined youtube_dl/extractor/__init__.py
index 32d616397de8c9d4d6cd0bf68046a651739cdc7e,ba12e326350b113a3dd4cead1e5027e9d9ae681a..ab0f76862d0100445db7d4d3eae8cae93b57f34d
--- 1/youtube_dl/extractor/__init__.py
--- 2/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -7,7 -7,6 +7,7 @@@ from .adobetv import AdobeTVI
  from .adultswim import AdultSwimIE
  from .aftonbladet import AftonbladetIE
  from .aljazeera import AlJazeeraIE
 +from .alphaporno import AlphaPornoIE
  from .anitube import AnitubeIE
  from .anysex import AnySexIE
  from .aol import AolIE
@@@ -65,6 -64,7 +65,7 @@@ from .cnet import CNETI
  from .cnn import (
      CNNIE,
      CNNBlogsIE,
+     CNNArticleIE,
  )
  from .collegehumor import CollegeHumorIE
  from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
@@@ -109,7 -109,6 +110,7 @@@ from .elpais import ElPaisI
  from .empflix import EMPFlixIE
  from .engadget import EngadgetIE
  from .eporner import EpornerIE
 +from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
@@@ -408,7 -407,6 +409,7 @@@ from .ted import TEDI
  from .telebruxelles import TeleBruxellesIE
  from .telecinco import TelecincoIE
  from .telemb import TeleMBIE
 +from .teletask import TeleTaskIE
  from .tenplay import TenPlayIE
  from .testurl import TestURLIE
  from .tf1 import TF1IE