commit dc44e06ef305be8de060af69a468e003e231ba05
author Jeff Tinker <jtinker@google.com> Fri Dec 09 11:13:39 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 09 11:13:39 2011 -0800
tree 8983faa2d2c6ac45954105e5b1bd7b4035b59f2d
parent a4f49ac5284d7ab97e56e318523652f35d9de0d6
parent ef664f62a1525e8f53d0937e889333544ffef3ad

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.

media/libstagefright/AwesomePlayer.cpp

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 @@
 
         mWVMExtractor = new WVMExtractor(dataSource);
         mWVMExtractor->setAdaptiveStreamingMode(true);
+        mWVMExtractor->setDrmFlag(true);
         extractor = mWVMExtractor;
     } else {
         extractor = MediaExtractor::Create(