admin/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
Files
50fc350c1bfdfd093ff3f59b5eeab3501ba71627
jellyfin/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
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

37 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink