diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-10-26 17:53:46 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-10-26 17:53:46 +0200 |
| commit | eaf5967f4f3b36b6c85b07b8d440bb00d452e715 (patch) | |
| tree | 843292206de6d10816c79059faf77d28c1e7547c /src | |
| parent | www has now lower as well (diff) | |
| parent | fixed hls stream base url (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src')
| -rwxr-xr-x | src/flufigut.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index 4634ccc..619fbec 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -195,7 +195,7 @@ if output_format == 'flumotion': feeder = 'input-%s' % (mux[mux_name]['audio']) audio_encoder = 'encode-%s-%s-%i-%i' % (source, encoder, bitrate, samplerate) if audio_encoder not in flow['encoder_audio']: - worker_name = 'encoder-%s-%s-%s' % (source, encoder, bitrate) + worker_name = 'encoder-%s-%s' % (source, encoder) if worker_name not in worker: worker[worker_name] = -1 else: @@ -223,7 +223,7 @@ if output_format == 'flumotion': feeder = 'input-%s' % (mux[mux_name]['video']) video_encoder = 'encode-%s-%s-%s' % (source, encoder, resolution) if video_encoder not in flow['encoder_video'].keys(): - worker_name = 'encoder-%s-%s-%s' % (source, encoder, resolution) + worker_name = 'encoder-%s-%s' % (source, encoder) if worker_name not in worker: worker[worker_name] = -1 else: @@ -239,7 +239,7 @@ if output_format == 'flumotion': } muxer = globals['formats'][format]['muxer'] - worker_name = 'muxer-%s-%s-%s' % (mux_name, format, profile) + worker_name = 'muxer-%s-%s' % (mux_name, format) if worker_name not in worker: worker[worker_name] = -1 else: |