am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit '406dd5d1e48752177753666867403542e1f400ca':
  Fixed the false drm recognition.

diff --cc media/libstagefright/AwesomePlayer.cpp
Simple merge

diff --cc media/libstagefright/MediaExtractor.cpp
index 2171492,9eee6aa..d65dc51
--- 1/media/libstagefright/MediaExtractor.cpp
--- 2/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@@ -110,12 -109,13 +110,15 @@@ sp<MediaExtractor> MediaExtractor::Crea
          ret = new MatroskaExtractor(source);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {
          ret = new MPEG2TSExtractor(source);
 +    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_AVI)) {
 +        ret = new AVIExtractor(source);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {
          ret = new WVMExtractor(source);
+         if (ret != NULL) {
+             isDrm = true;
+         }
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {
 -        ret = new AACExtractor(source);
 +        ret = new AACExtractor(source, meta);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) {
          ret = new MPEG2PSExtractor(source);
      }