jellyfin/MediaBrowser.Server.Implementations/MediaEncoder at 5fa577a9ee143ac570dbd237270d33374e8a15a2 - jellyfin - Gitea: Git with a cup of tea

OpenSource/jellyfin

0 Fork 0

mirror of https://github.com/jellyfin/jellyfin.git synced 2026-11-02 20:25:50 +00:00

Files

T

History

Luke Pulverenti c543fdea3a Merge branch 'master' of https://github.com/tikuf/MediaBrowser

Conflicts:
	MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
	MediaBrowser.Api/Playback/Progressive/VideoService.cs

2013-11-01 11:59:42 -04:00

..

MediaEncoder.cs

Merge branch 'master' of https://github.com/tikuf/MediaBrowser

2013-11-01 11:59:42 -04:00