Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

Minds Backend - Engine
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

d04f86ce

Commit d04f86ce authored 5 years ago by Mark Harding

Downloads
- Plain Diff

Merge branch 'feat/1080p-encoding-for-pro' into 'master'

1080p encoding for pro

Closes #964

See merge request !373

parents 9c7ae9b5 9c605f99

No related branches found

No related tags found

Loading

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

Controllers/Cli/Transcode.php 3 additions, 2 deletions

Controllers/Cli/Transcode.php
Controllers/api/v1/media.php 10 additions, 3 deletions

Controllers/api/v1/media.php
Controllers/api/v1/newsfeed.php 3 additions, 2 deletions

Controllers/api/v1/newsfeed.php
Controllers/api/v2/media/upload.php 6 additions, 1 deletion

Controllers/api/v2/media/upload.php
Core/Media/ClientUpload/Manager.php 19 additions, 1 deletion

Core/Media/ClientUpload/Manager.php
Core/Media/Services/FFMpeg.php 22 additions, 0 deletions

Core/Media/Services/FFMpeg.php
Core/Queue/Runners/Transcode.php 3 additions, 1 deletion

Core/Queue/Runners/Transcode.php
Entities/Video.php 9 additions, 5 deletions

Entities/Video.php
Spec/Core/Media/ClientUpload/ManagerSpec.php 6 additions, 2 deletions

Spec/Core/Media/ClientUpload/ManagerSpec.php
settings.example.php 3 additions, 3 deletions

settings.example.php

with 84 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment