| commit | 35f53af1dab2f9edc66ba23e02edfa8de853effc | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Oct 25 20:10:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 25 20:10:25 2016 +0000 |
| tree | 8e8b5faed7be4f518ae3502e1c35e4ad58aa2292 | |
| parent | a5c08f7c51a11a50ceb572c1a57f7f84a56c5cda [diff] | |
| parent | 78d6bc884cc0b453ffc68cbeb1ceb1497cf9ee85 [diff] |
Merge "Prefer software codec with debug property" am: 829b2a0bf0 am: 78d6bc884c Change-Id: Ib6ddd38115e71956c142d5caf061d8d219054b39
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); } }