alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-16 16:18:06 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
Files
e89a0d080bc07d3933985eb281a67d0c1f40fce3
jellyfin/MediaBrowser.Server.Implementations/MediaEncoder
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