2 files changed, 11 insertions, 0 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index fd4d3d9c9..6ece7e8bc 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -220,6 +220,14 @@
         <ng-template [ngIf]="isTranscodingEnabled()">
 
           <div class="form-group">
+            <my-peertube-checkbox
+              inputName="transcodingAllowAdditionalExtensions" formControlName="transcodingAllowAdditionalExtensions"
+              i18n-labelText labelText="Allow additional extensions"
+              i18n-helpHtml helpHtml="Allow your users to upload .mkv, .mov, .avi, .flv videos"
+            ></my-peertube-checkbox>
+          </div>
+
+          <div class="form-group">
             <label i18n for="transcodingThreads">Transcoding threads</label>
             <div class="peertube-select-container">
               <select id="transcodingThreads" formControlName="transcodingThreads">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index f48b6fc1a..6eea1cd76 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -82,6 +82,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
       userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY,
       transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS,
+      transcodingAllowAdditionalExtensions: null,
       transcodingEnabled: null,
       customizationJavascript: null,
       customizationCSS: null
@@ -163,6 +164,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       },
       transcoding: {
         enabled: this.form.value['transcodingEnabled'],
+        allowAdditionalExtensions: this.form.value['transcodingAllowAdditionalExtensions'],
         threads: this.form.value['transcodingThreads'],
         resolutions: {
           '240p': this.form.value[this.getResolutionKey('240p')],
@@ -221,6 +223,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily,
       transcodingThreads: this.customConfig.transcoding.threads,
       transcodingEnabled: this.customConfig.transcoding.enabled,
+      transcodingAllowAdditionalExtensions: this.customConfig.transcoding.allowAdditionalExtensions,
       customizationJavascript: this.customConfig.instance.customizations.javascript,
       customizationCSS: this.customConfig.instance.customizations.css,
       importVideosHttpEnabled: this.customConfig.import.videos.http.enabled,