[ffmpeg] Improve version check and call it from hls (Fixes #4377)

This commit is contained in:
Philipp Hagemeister 2014-12-06 12:14:26 +01:00
parent f6735be4da
commit 5f9b83944d
4 changed files with 14 additions and 4 deletions

View file

@ -48,6 +48,7 @@ from youtube_dl.utils import (
intlist_to_bytes,
args_to_str,
parse_filesize,
version_tuple,
)
@ -381,5 +382,10 @@ class TestUtil(unittest.TestCase):
self.assertEqual(parse_filesize('1.2Tb'), 1200000000000)
self.assertEqual(parse_filesize('1,24 KB'), 1240)
def test_version_tuple(self):
self.assertEqual(version_tuple('1'), (1,))
self.assertEqual(version_tuple('10.23.344'), (10, 23, 344))
self.assertEqual(version_tuple('10-6'), (10, 6)) # avconv style
if __name__ == '__main__':
unittest.main()