| commit | cf622335cffa6c1bbd1f424b27ef1f1453b0cdb2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Sep 23 20:59:46 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Sep 23 20:59:46 2024 +0000 |
| tree | 3d25fea83eff6ce53d64e44f6cd8161ae8cb6201 | |
| parent | fe0d929665d00ec7c364cf988d72784b380e16b2 [diff] | |
| parent | 967c8f092329d8ac50d5ca6ebdefd821e6a032be [diff] |
Merge "MediaCodecsXmlParser: append variants instead of replacing" into main
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) {