File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed
Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change 5858from requests .packages .urllib3 .exceptions import InsecureRequestWarning
5959requests .packages .urllib3 .disable_warnings (InsecureRequestWarning )
6060
61+ import utilities
62+
6163# Lambdas as shorthands for printing various types of data
6264# See https://pypi.python.org/pypi/termcolor for more info
6365color_title = lambda x : colored (x , 'cyan' , 'on_grey' )
@@ -891,6 +893,12 @@ def findffmpeg(path_to_ffmpeg_install=None, working_dir=None):
891893 if os .path .isfile (bin_dist ):
892894 return str (Path (bin_dist ).resolve ())
893895
896+ # Attempt to find ffmpeg in the environment
897+ try :
898+ return utilities .get_ffmpeg_location ()
899+ except Exception :
900+ pass # Ignoring the exception
901+
894902 # Throw an error
895903 raise ValueError ('Could not locate FFMPEG install, please use the --ffmpeg switch to specify the path to the ffmpeg executable on your system.' )
896904
You can’t perform that action at this time.
0 commit comments