commit | 829b2a0bf09d6d18d7ee30886f553fa20dcab1d0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Oct 25 20:01:10 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Oct 25 20:01:10 2016 +0000 |
tree | 8566348fb6ababcac5d5a2d1be274d2b44f9f601 | |
parent | 460dcb750d6d4658dd730a1ae2e1e18015913ff5 [diff] | |
parent | 62af0c3fafa9a256c4251aa9fdbf56a260ec55b7 [diff] |
Merge "Prefer software codec with debug property"
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 8afb7e9..23d49f0 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp
@@ -1173,7 +1173,7 @@ } } - if (flags & kPreferSoftwareCodecs) { + if (flags & kPreferSoftwareCodecs || property_get_bool("debug.stagefright.swcodec", false)) { matches->sort(compareSoftwareCodecsFirst); } }