Skip to content
Snippets Groups Projects
Commit 0e5c4a86 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Fix FFmpeg test in case FFmpeg was not available at compile time

parent e7c8c376
No related branches found
No related tags found
No related merge requests found
...@@ -98,6 +98,8 @@ def test_format_codecs(): ...@@ -98,6 +98,8 @@ def test_format_codecs():
distortions['mpeg2video']['color'] = 9.0 distortions['mpeg2video']['color'] = 9.0
distortions['mpeg2video']['frameskip'] = 1.4 distortions['mpeg2video']['frameskip'] = 1.4
from .._externals import versions
if versions['FFmpeg']['ffmpeg'] != 'unavailable':
from .._externals import supported_videowriter_formats from .._externals import supported_videowriter_formats
SUPPORTED = supported_videowriter_formats() SUPPORTED = supported_videowriter_formats()
for format in SUPPORTED: for format in SUPPORTED:
...@@ -179,6 +181,8 @@ def test_user_video(): ...@@ -179,6 +181,8 @@ def test_user_video():
msmpeg4v2 = 2.3, msmpeg4v2 = 2.3,
) )
from .._externals import versions
if versions['FFmpeg']['ffmpeg'] != 'unavailable':
from .._externals import supported_videowriter_formats from .._externals import supported_videowriter_formats
SUPPORTED = supported_videowriter_formats() SUPPORTED = supported_videowriter_formats()
for format in SUPPORTED: for format in SUPPORTED:
......
...@@ -71,6 +71,7 @@ def ffmpeg_version_lessthan(v): ...@@ -71,6 +71,7 @@ def ffmpeg_version_lessthan(v):
indicated as a string parameter.''' indicated as a string parameter.'''
from .._externals import versions from .._externals import versions
if versions['FFmpeg']['ffmpeg'] == 'unavailable': return False
avcodec_inst= SV(versions['FFmpeg']['avcodec']) avcodec_inst= SV(versions['FFmpeg']['avcodec'])
avcodec_req = ffmpeg_versions[v][0] avcodec_req = ffmpeg_versions[v][0]
return avcodec_inst < avcodec_req return avcodec_inst < avcodec_req
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment