90039e1ad3
Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio
...
# Conflicts:
# Emby.Server.Implementations/ApplicationHost.cs
# Jellyfin.Api/Helpers/TranscodingJobHelper.cs
4 years ago
1385064497
Merge remote-tracking branch 'upstream/master' into api-migration-merge
4 years ago
3514813eb4
Continute work
4 years ago
68dd31d00e
Remove routes in old service
4 years ago
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
...
Add full stop at end of comments (SA1629)
4 years ago
247f9c61e6
fix SA1513/SA1516
4 years ago
9018f8d8be
Add full stop at end of comments (SA1629)
4 years ago
3d9049ef08
fix SA1508
4 years ago
acd4389653
fix SA1005
4 years ago
bb23ce3466
Merge branch 'master' into userdb-efcore
5 years ago
d92b32a4c6
Fix incorrect HLS master playlist fields
...
Resolves : #3224
5 years ago
06f9cde22f
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
5 years ago
c31b2798a5
Merge pull request #3180 from xumix/master
...
Refactor copy codec checks
5 years ago
73d123fe36
fix issue with audio transcoding
5 years ago
46420dfd68
Refactor copy codec checks
5 years ago
aca7e221d8
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
5 years ago
dcaffd3812
Fix regressions introduced by #3098
5 years ago
c1360a1dc3
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Entities/User.cs
# Jellyfin.Data/ISavingChanges.cs
# Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
# Jellyfin.Server.Implementations/JellyfinDb.cs
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Model/Notifications/NotificationOptions.cs
# MediaBrowser.sln
5 years ago
9ad839c776
Initial migration code
5 years ago
c15463fa12
Merge pull request #2837 from Bond-009/async2
...
Minor IAsyncDisposable improvements
5 years ago
7f7a686ea6
Merge pull request #2573 from YouKnowBlom/add-hls-fields
...
Add codecs, resolution and frame-rate fields to HLS master playlist
5 years ago
153ea9f027
Fix error in HLS codecs field when level is null
5 years ago
7f4a229cd2
Add some simple tests
5 years ago
5c669d7ad7
Merge pull request #2849 from lyonzy/patch-1
...
Handle null outputFileExtension in GetOutputFilePath
5 years ago
e7fde6aaca
Handle null outputFileExtension with null-conditional operator
5 years ago
31769bda28
Merge pull request #2745 from Artiume/patch-6
...
Force Audio Transcoding for LiveTV Transcoding
5 years ago
38dae51ccf
Minor IAsyncDisposable improvements
5 years ago
b52199e9e2
Handle null outputFileExtension in GetOutputFilePath
5 years ago
6386b9b1b9
Merge pull request #2782 from JustAMan/fix-ssa-delivery
...
Fix support for attachments with baseURL set
5 years ago
5be60782ed
Fix support for attachments with baseURL set
...
* Revert "Add baseURL to attachments"
* This is properly handled by jellyfin-web#1020
5 years ago
81b4a4c54c
Implement various suggestions
5 years ago
e1958e3902
Miscellaneous code cleanup
5 years ago
add0a2088d
Simplified Conditionals and returns
5 years ago
80cfcf5643
Remove unnecessary casts and explicit array types
5 years ago
961f48f5bc
Use ? and ?? where applicable
5 years ago
6a3f9253db
Convert using statements to using declarations where applicable
5 years ago
5966ee6d87
Convert type checks and null checks into pattern matching
5 years ago
d10ae74b38
Force Audio Transcoding for LiveTV Transcoding
...
Noticing some sync issues when transcoding livetv, the only thing I was able to do to fix it was to force the audio stream to be transcoded as well. This was how I originally wrote the code and we changed it during the review process. I am reverting it back to the original code.
5 years ago
ddd5d3aaec
Merge branch 'master' into usings
5 years ago
9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi
...
Fix various bugs in HWA subtitle burn-in
5 years ago
95c5c08610
minor improvements
5 years ago
0af353404c
fix the UTF-16 error while burning ass/ssa subtitles
5 years ago
0e9d9a7897
fix the incorrect HLS time while using hw encoders
5 years ago
fac6831653
fix various bugs in VAAPI hardware acceleration
5 years ago
e9d1eabd53
Remove unused usings
5 years ago
0a2d24aff3
Add RESOLUTION field to HLS master playlist
5 years ago
8a990d1d95
Add FRAME-RATE field to HLS master playlist
5 years ago
f2858878d1
Add CODECS field to HLS master playlist
5 years ago
85da15685f
Refactor DynamicHlsService.AppendPlaylist to use StringBuilder
5 years ago
94fe9b8f6d
Merge branch 'master' into warn17
5 years ago
David
crobibero
Bond-009
telans
Patrick Barron
Andreas B
Anthony Lavado
dkanada
xumix
Joshua M. Boniface
Matt Lyons
Vasily
Vasily
artiume
nyanmisaka