Fix RELEASENOTES merge conflict

PiperOrigin-RevId: 650551156
This commit is contained in:
dancho 2024-07-09 02:40:21 -07:00 committed by Copybara-Service
parent 439536480b
commit 7d4f623b00

View File

@ -24,12 +24,6 @@
Transformer via a `Surface`.
* Track Selection:
* Extractors:
* Allow `Mp4Extractor` to identify H264 samples that are not used as
reference by subsequent samples.
* DataSource:
* Update `HttpEngineDataSource` to allow use starting at version S
extension 7 instead of API level 34
([#1262](https://github.com/androidx/media/issues/1262)).
* Allow `Mp4Extractor` and `FragmentedMp4Extractor` to identify H264
samples that are not used as reference by subsequent samples.
* Audio: