diff options
| author | Andreas Huber <andih@google.com> | 2011-12-06 10:01:27 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-12-06 11:24:34 -0800 |
| commit | 92f604c4d465572efccfd7b1572080f48dc972c1 (patch) | |
| tree | acc74404b9b98a01f2668802b3bc9e567ab3ae68 /media | |
| parent | 4079702ac27b51282a25de5f7c20f6fba6b71995 (diff) | |
| download | frameworks_base-92f604c4d465572efccfd7b1572080f48dc972c1.zip frameworks_base-92f604c4d465572efccfd7b1572080f48dc972c1.tar.gz frameworks_base-92f604c4d465572efccfd7b1572080f48dc972c1.tar.bz2 | |
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 0aeb515..690deac 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -9,7 +9,6 @@ LOCAL_SRC_FILES:= \ AACWriter.cpp \ AMRExtractor.cpp \ AMRWriter.cpp \ - AVIExtractor.cpp \ AudioPlayer.cpp \ AudioSource.cpp \ AwesomePlayer.cpp \ diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 70523c1..43539bb 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -15,7 +15,6 @@ */ #include "include/AMRExtractor.h" -#include "include/AVIExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG4Extractor.h" #include "include/WAVExtractor.h" @@ -113,7 +112,6 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffMPEG2TS); RegisterSniffer(SniffMP3); RegisterSniffer(SniffAAC); - RegisterSniffer(SniffAVI); RegisterSniffer(SniffMPEG2PS); char value[PROPERTY_VALUE_MAX]; diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 2221268..374ecf7 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -19,7 +19,6 @@ #include <utils/Log.h> #include "include/AMRExtractor.h" -#include "include/AVIExtractor.h" #include "include/MP3Extractor.h" #include "include/MPEG4Extractor.h" #include "include/WAVExtractor.h" @@ -110,8 +109,6 @@ sp<MediaExtractor> MediaExtractor::Create( 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); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) { |