blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-08-08 11:57:34 +08:00
Code Issues Projects Releases Wiki Activity

Build data: Fix ffmpeg cmd arg not being passed on

Browse Source
This commit is contained in:
Ross Patterson 2019-08-07 01:38:12 -07:00
parent 34adcb88dd
commit 891ca521fd
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ffmpeg/_build.py
View File

@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
parser = argparse.ArgumentParser(description=__doc__) parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument( parser.add_argument(
'--ffmpeg', type=argparse.FileType('r'), '--ffmpeg', default='ffmpeg',
help='The path to the ffmpeg execuatble') help='The path to the ffmpeg execuatble')
@ -69,6 +69,7 @@ def _run(args):
process.returncode, process.args, output=stdout, stderr=stderr) process.returncode, process.args, output=stdout, stderr=stderr)
return stdout.decode() return stdout.decode()
def _get_line_fields( def _get_line_fields(
stdout, header_lines, line_re, flags={}, int_fields=set()): stdout, header_lines, line_re, flags={}, int_fields=set()):
""" """
@ -256,21 +257,21 @@ def get_build_data(cmd='ffmpeg'):
Extract details about the ffmpeg build. Extract details about the ffmpeg build.
""" """
return dict( return dict(
version=get_version(cmd='ffmpeg'), version=get_version(cmd=cmd),
formats=get_formats(cmd='ffmpeg'), formats=get_formats(cmd=cmd),
demuxers=get_demuxers(cmd='ffmpeg'), demuxers=get_demuxers(cmd=cmd),
muxers=get_muxers(cmd='ffmpeg'), muxers=get_muxers(cmd=cmd),
codecs=get_codecs(cmd='ffmpeg'), codecs=get_codecs(cmd=cmd),
bsfs=get_bsfs(cmd='ffmpeg'), bsfs=get_bsfs(cmd=cmd),
protocols=get_protocols(cmd='ffmpeg'), protocols=get_protocols(cmd=cmd),
filters=get_filters(cmd='ffmpeg'), filters=get_filters(cmd=cmd),
pix_fmts=get_pix_fmts(cmd='ffmpeg'), pix_fmts=get_pix_fmts(cmd=cmd),
sample_fmts=get_sample_fmts(cmd='ffmpeg'), sample_fmts=get_sample_fmts(cmd=cmd),
layouts=get_layouts(cmd='ffmpeg'), layouts=get_layouts(cmd=cmd),
colors=get_colors(cmd='ffmpeg'), colors=get_colors(cmd=cmd),
devices=get_devices(cmd='ffmpeg'), devices=get_devices(cmd=cmd),
hw_devices=get_hw_devices(cmd='ffmpeg'), hw_devices=get_hw_devices(cmd=cmd),
hwaccels=get_hwaccels(cmd='ffmpeg')) hwaccels=get_hwaccels(cmd=cmd))
__all__ = [ __all__ = [
'get_build_data', 'get_build_data',