Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SteelCast
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

12f1f4a6

Commit 12f1f4a6 authored 4 years ago by Silas Della Contrada

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/sdcieo0330/VanadiumCast

parents d9a0c469 16ff5f96

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VanadiumCast/VanadiumCast.pro 2 additions, 1 deletion

VanadiumCast/VanadiumCast.pro
VanadiumCast/res/gui/fragments/PageMedia.qml 4 additions, 0 deletions

VanadiumCast/res/gui/fragments/PageMedia.qml
VanadiumCast/src/main.cpp 4 additions, 1 deletion

VanadiumCast/src/main.cpp
backend/backend.pro 3 additions, 0 deletions

backend/backend.pro
backend/src/MediaProcessing/OGLUtil.cpp 61 additions, 0 deletions

backend/src/MediaProcessing/OGLUtil.cpp
backend/src/MediaProcessing/OGLUtil.h 31 additions, 0 deletions

backend/src/MediaProcessing/OGLUtil.h
backend/src/MediaProcessing/VideoTranscoder.cpp 9 additions, 1 deletion

backend/src/MediaProcessing/VideoTranscoder.cpp
backend/src/MediaProcessing/VideoTranscoder.h 45 additions, 5 deletions

backend/src/MediaProcessing/VideoTranscoder.h

with 159 additions and 8 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