commit a6e549455a17970b5e7b75686d6cc1c7169d59c3
author Jeff Tinker <jtinker@google.com> Mon Dec 12 15:30:16 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 12 15:30:16 2011 -0800
tree 5a9088d83e0f5bd5b05c3947d871310ce2aca174
parent 3f6efeaad72bac766351b91d7c47639ca6d08330
parent dc44e06ef305be8de060af69a468e003e231ba05

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.

media/libstagefright/AwesomePlayer.cpp

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