Skip to content

Resolve merge conflict in changelog #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaartenRimaux merged 1 commit into from
Dec 19, 2025
Merged

Resolve merge conflict in changelog #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [10.7.0] - 2025-12-18

<<<<<<< HEAD
### Changed

- Conviva
- Bumped the Conviva SDK dependency to 4.2.4.
=======

### Fixed

- SideloadedSubtitle
- Fixed an issue where the stream would not play if an invalid subtitle source is passed and activated.
>>>>>>> 22a7075 (add changelog)

## [10.4.0] - 2025-11-05

Expand All @@ -30,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Conviva
- Conviva
- Report droppedFrames and renderedFramerates from player metrics, making the AVPlayer accesslog usage obsolete.
- Nielsen
- Bumped minimum Nielsen SDK Dependency to 10.0.0
Expand Down Expand Up @@ -91,7 +89,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Conviva
- Added average bitrate reporting

### Fixed

- Conviva
Expand All @@ -100,6 +98,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed

- Conviva

- Removed Objective-C API support.

- Yospace
Expand Down Expand Up @@ -151,15 +150,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Conviva
- Fixed an issue where the vpfDetector was not firing a VPF due to a missing player reference.
- Fixed an issue where the vpfDetector was not firing a VPF due to a missing player reference.

## [7.10.0] - 2024-08-13

### Fixed

- Conviva
- Fixed an issue where multiple fatal errors were reported to the Conviva backend, resulting in multiple sessions being created.
- Fixed an issue where VPF was not detected for VOD when the player has enough buffered data to get passed the detection interval.
- Fixed an issue where multiple fatal errors were reported to the Conviva backend, resulting in multiple sessions being created.
- Fixed an issue where VPF was not detected for VOD when the player has enough buffered data to get passed the detection interval.

## [7.9.0] - 2024-08-01

Expand Down