diff options
| author | Jeff Tinker <jtinker@google.com> | 2011-12-09 11:13:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 11:13:39 -0800 |
| commit | 736d8141e8f060c79c297c5447cdbe2c7fa9e231 (patch) | |
| tree | dd64d410e936b9d0a31ca606598ae34153faca4d | |
| parent | 254868809d7df841112209fcbf5c191cce013f81 (diff) | |
| parent | 7e976e926dd8085a64a7add97ce09bfeca26e088 (diff) | |
| download | frameworks_av-736d8141e8f060c79c297c5447cdbe2c7fa9e231.zip frameworks_av-736d8141e8f060c79c297c5447cdbe2c7fa9e231.tar.gz frameworks_av-736d8141e8f060c79c297c5447cdbe2c7fa9e231.tar.bz2 | |
am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index e58d700..ba6ff10 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2105,6 +2105,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { mWVMExtractor = new WVMExtractor(dataSource); mWVMExtractor->setAdaptiveStreamingMode(true); + mWVMExtractor->setDrmFlag(true); extractor = mWVMExtractor; } else { extractor = MediaExtractor::Create( |