diff --git a/CHANGELOG.md b/CHANGELOG.md index cdfce7c50..e4f5f571c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,7 +89,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - GIFs flagged to loop forever will loop forever - GIFs with a specific loop count will loop the specified number of times and then hold the final frame - Note that looping is relative to the start of the content, so this works best with permanent watermarks -- Fix some more hls.js warnins by adding codec information to multi-variant playlists +- Fix some more hls.js warnings by adding codec information to multi-variant playlists +- Fix hardware decode of h264 constrained baseline content using VAAPI accel ### Changed - Filler presets: use separate text fields for `hours`, `minutes` and `seconds` duration diff --git a/ErsatzTV.FFmpeg/Capabilities/VaapiHardwareCapabilities.cs b/ErsatzTV.FFmpeg/Capabilities/VaapiHardwareCapabilities.cs index 8ee45feeb..5b98730a8 100644 --- a/ErsatzTV.FFmpeg/Capabilities/VaapiHardwareCapabilities.cs +++ b/ErsatzTV.FFmpeg/Capabilities/VaapiHardwareCapabilities.cs @@ -54,7 +54,7 @@ public class VaapiHardwareCapabilities : IHardwareCapabilities VaapiEntrypoint: VaapiEntrypoint.Decode }), - (VideoFormat.H264, "baseline constrained" or "578") => + (VideoFormat.H264, "baseline constrained" or "constrained baseline" or "578") => _profileEntrypoints.Any(e => e is { VaapiProfile: VaapiProfile.H264ConstrainedBaseline,