| commit | d06f6c381be4d86e81fcac8a6c92132913eca0e0 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Tue Jun 05 19:17:33 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 05 19:17:33 2018 -0700 |
| tree | b0a51d24f44e9eec39ab33af1eef1db2b81da112 | |
| parent | dfc0730c3375c64b001b5672eedf94a2dbda59e1 [diff] | |
| parent | eb23624d682c062c28df9fe0ef0922c446262a89 [diff] |
MPEG4Extractor: ignore unknown crypto schemes am: cfa93539db am: eb23624d68 Change-Id: Iacd5388c2924712979a89a96dc4e84754711fb57
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index 1a56edc..7b3b81d 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -1023,7 +1023,9 @@ break; } } - mLastTrack->meta.setInt32(kKeyCryptoMode, mode); + if (mode != kCryptoModeUnencrypted) { + mLastTrack->meta.setInt32(kKeyCryptoMode, mode); + } break; }