| commit | b955cb535c6e7f3bb93e47334e1b81db5d2884a5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Sep 23 21:19:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 23 21:19:10 2024 +0000 |
| tree | 3d25fea83eff6ce53d64e44f6cd8161ae8cb6201 | |
| parent | 6f913af992beae4af3b6e90f672c09d237992963 [diff] | |
| parent | cf622335cffa6c1bbd1f424b27ef1f1453b0cdb2 [diff] |
Merge "MediaCodecsXmlParser: append variants instead of replacing" into main am: cf622335cf Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3274096 Change-Id: I39774c3fb38f265670268f74756578024638e49b 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) {