| commit | 78d6bc884cc0b453ffc68cbeb1ceb1497cf9ee85 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Oct 25 20:05:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 25 20:05:55 2016 +0000 |
| tree | 14b43a5499fc526bf756921eb08de5d5962853b0 | |
| parent | ba46fa9310d66239d7f4e0d1d7097b41c0e5869e [diff] | |
| parent | 829b2a0bf09d6d18d7ee30886f553fa20dcab1d0 [diff] |
Merge "Prefer software codec with debug property" am: 829b2a0bf0 Change-Id: Ib5cc5065540f48efaebeb02ecd1bd8036f0e56d1
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); } }