michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
01f1ed05b9
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