summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2011-12-12 15:30:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-12 15:30:16 -0800
commitfec2284d520fa2856358692095a715678225abcb (patch)
tree1218ef21e382416724a8d29a820b9680ac57030f /media/libstagefright
parentd1b9f44fccd387abbc42b6923b2b06ac7db1aa05 (diff)
parent736d8141e8f060c79c297c5447cdbe2c7fa9e231 (diff)
downloadframeworks_av-fec2284d520fa2856358692095a715678225abcb.zip
frameworks_av-fec2284d520fa2856358692095a715678225abcb.tar.gz
frameworks_av-fec2284d520fa2856358692095a715678225abcb.tar.bz2
am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit 'dc44e06ef305be8de060af69a468e003e231ba05': Fix drm flag setting missed in false drm recognition fix.
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 19c1a65..42f18d3 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(