cvium c658a883a2 Merge branch 'master' into keyframe_extraction_v1 ... # Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs		2022-01-07 10:23:22 +01:00
..
Attachments	Remove more warnings	2021-12-27 07:38:06 -07:00
BdInfo	Fix warning: Qualifier is redundant (#2149)	2021-10-03 11:01:40 +07:00
Configuration	Add some analyzers to MediaBrowser.MediaEncoding	2020-08-04 17:08:09 +02:00
Encoder	Merge branch 'master' into keyframe_extraction_v1	2022-01-07 10:23:22 +01:00
Probing	Merge pull request #6934 from nyanmisaka/hwa	2021-12-26 17:32:06 +00:00
Properties	Add tests for EncoderValidator	2019-09-28 19:41:34 +02:00
Subtitles	Remove more warnings	2021-12-27 07:38:06 -07:00
MediaBrowser.MediaEncoding.csproj	Update StyleCop	2021-12-24 18:28:27 +01:00