Merge pull request #6428 from dstftw/improve-generic-smil-support

author Sergey M. <dstftw@gmail.com>

Fri, 7 Aug 2015 23:47:33 +0000 (05:47 +0600)

committer Sergey M. <dstftw@gmail.com>

Fri, 7 Aug 2015 23:47:33 +0000 (05:47 +0600)
author Sergey M. <dstftw@gmail.com>
Fri, 7 Aug 2015 23:47:33 +0000 (05:47 +0600)
committer Sergey M. <dstftw@gmail.com>
Fri, 7 Aug 2015 23:47:33 +0000 (05:47 +0600)
diff --cc youtube_dl/extractor/common.py
Simple merge
diff --cc youtube_dl/extractor/generic.py
Simple merge
author	Sergey M. <dstftw@gmail.com>
	Fri, 7 Aug 2015 23:47:33 +0000 (05:47 +0600)
committer	Sergey M. <dstftw@gmail.com>
	Fri, 7 Aug 2015 23:47:33 +0000 (05:47 +0600)
		1	2
youtube_dl/extractor/common.py	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dl/extractor/generic.py	patch \|	diff1 \|	diff2 \|	blob \| history