diff options
| author | Gloria Wang <gwang@google.com> | 2010-10-25 15:23:04 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:11:18 -0700 |
| commit | a9741a9232c81eaf59179acef91f5be46c42264e (patch) | |
| tree | 9a66416b42a28ec2ad4fa2ec520c42d976046aec /media/libstagefright/DataSource.cpp | |
| parent | d8cba5371423841e6a85816ad4a7fd88d3a60b12 (diff) | |
| parent | dcd25efb46c41c8d24a0a9cf61fb57f84149709e (diff) | |
| download | frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.zip frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.gz frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.bz2 | |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 49eac62..be23c60 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -22,6 +22,7 @@ #include "include/MPEG2TSExtractor.h" #include "include/NuCachedSource2.h" #include "include/NuHTTPDataSource.h" +#include "include/DRMExtractor.h" #include "matroska/MatroskaExtractor.h" @@ -104,6 +105,7 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffAMR); RegisterSniffer(SniffMPEG2TS); RegisterSniffer(SniffMP3); + RegisterSniffer(SniffDRM); } // static |