diff options
| author | Andreas Huber <andih@google.com> | 2010-03-10 11:12:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-10 11:12:56 -0800 |
| commit | b94b52b94e63a77a20a7ea907bea49485091bbf7 (patch) | |
| tree | a57745bdf6d777669ade11d7184a7384c482ac38 /include | |
| parent | 8da2650df87d5166fc940482c25632b034e16656 (diff) | |
| parent | 1ce986767ae5998ece6810c2933d0b274c529744 (diff) | |
| download | frameworks_base-b94b52b94e63a77a20a7ea907bea49485091bbf7.zip frameworks_base-b94b52b94e63a77a20a7ea907bea49485091bbf7.tar.gz frameworks_base-b94b52b94e63a77a20a7ea907bea49485091bbf7.tar.bz2 | |
Merge "Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files."
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/StagefrightMediaScanner.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/stagefright/StagefrightMediaScanner.h b/include/media/stagefright/StagefrightMediaScanner.h index af125dc..4437eee 100644 --- a/include/media/stagefright/StagefrightMediaScanner.h +++ b/include/media/stagefright/StagefrightMediaScanner.h @@ -22,7 +22,7 @@ namespace android { -struct StagefrightMetadataRetriever; +struct MediaMetadataRetriever; struct StagefrightMediaScanner : public MediaScanner { StagefrightMediaScanner(); @@ -35,7 +35,7 @@ struct StagefrightMediaScanner : public MediaScanner { virtual char *extractAlbumArt(int fd); private: - sp<StagefrightMetadataRetriever> mRetriever; + sp<MediaMetadataRetriever> mRetriever; StagefrightMediaScanner(const StagefrightMediaScanner &); StagefrightMediaScanner &operator=(const StagefrightMediaScanner &); |