Merge remote-tracking branch 'jvs3/master' into develop

This commit is contained in:
rembo10
2015-12-01 10:11:04 -08:00
3 changed files with 12 additions and 1 deletions
+5
View File
@@ -1402,6 +1402,11 @@
<input type="text" name="xldprofile" value="${config['xldprofile']}" size="43">
</div>
</div>
<div class="row">
<label>Extension</label>
<input type="text" name="encoderoutputformat" value="${config['encoderoutputformat']}" size="43">
<small>If different from format selected above</small>
</div>
<div class="row">
<label>Path to Encoder</label>
<input type="text" name="encoder_path" value="${config['encoder_path']}" size="43">