diff options
author | Christian Pointner <equinox@spreadspace.org> | 2012-09-30 16:40:40 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2012-09-30 16:40:40 +0200 |
commit | 116bbc6c04e1b027d03beb5d436784fc718a5843 (patch) | |
tree | 2954a6c580b7b9ba7f299cb51f8c2478103702e5 /src/flufigut.py | |
parent | muxer components, feeder matching to be done (diff) |
cleanup
Diffstat (limited to 'src/flufigut.py')
-rwxr-xr-x | src/flufigut.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index 64e0d44..becb727 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -204,18 +204,16 @@ flow['muxer'] = {} for format in config['muxer'].keys(): muxer = config['globals']['formats'][format]['muxer'] - aencoder = config['globals']['formats'][format]['audio'] - if 'video' in config['globals']['formats'][format]: - vencoder = config['globals']['formats'][format]['video'] - else: - vencoder = 'none' for profile in config['muxer'][format]: resolution = config['globals']['profiles'][profile]['video'] arate = config['globals']['profiles'][profile]['audio'] - feeder_audio = aencoder - feeder_video = vencoder + feeder_audio = 'encoder-%s-%s' % (config['globals']['formats'][format]['audio'], arate) + if 'video' in config['globals']['formats'][format]: + feeder_video = 'encoder-%s-%s' % (config['globals']['formats'][format]['video'], resolution) + else: + feeder_video = 'none' flow['muxer']['muxer-%s-%s' % (muxer, profile)] = { 'type': '%s-mux' % muxer, |