starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-26 10:44:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
c543fdea3a2c16b8bdb0b8b9b71e89a9b106b34c
jellyfin-jellyfin-1/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