| commit | 1731e2be1dbeabbe5760b832759e8bf0ac9e48ca | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Sep 23 21:31:00 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 23 21:31:00 2024 +0000 |
| tree | 152c7257d858b907afe21700e50e91494344dd3c | |
| parent | bd4d7e42dc7980279993540c326fa43b726f3fbc [diff] | |
| parent | b955cb535c6e7f3bb93e47334e1b81db5d2884a5 [diff] |
Merge "MediaCodecsXmlParser: append variants instead of replacing" into main am: cf622335cf am: b955cb535c Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3274096 Change-Id: I9fc53fba375e340f95c857d809656c8705176e16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp b/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp index 8c1ef3b..bd11326 100644 --- a/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp +++ b/media/libstagefright/xmlparser/MediaCodecsXmlParser.cpp
@@ -1069,7 +1069,7 @@ codec.rank = rank; } - codec.variantSet = variants; + codec.variantSet.insert(variants.begin(), variants.end()); // we allow sets of domains... for (const std::string &domain : domains) {