diff options
| author | Andreas Huber <andih@google.com> | 2012-05-07 11:01:58 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-05-07 11:01:58 -0700 |
| commit | e51770946feca174d2d65811f773dcfc3d66ad3b (patch) | |
| tree | a6f54ffff7ee5974778eb8ddfc5910287d7d57d8 /media | |
| parent | fc52dd88e4d2f433feba5d5aaff1880659d46319 (diff) | |
| download | frameworks_av-e51770946feca174d2d65811f773dcfc3d66ad3b.zip frameworks_av-e51770946feca174d2d65811f773dcfc3d66ad3b.tar.gz frameworks_av-e51770946feca174d2d65811f773dcfc3d66ad3b.tar.bz2 | |
Remove/Disable the AVI extractor.
Change-Id: I47dcae710df9c66688a937fb1e648f9b00ca0f65
related-to-bug: 5717242
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 e2e5091..78a68fd 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 3400724..c75f100 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -15,7 +15,6 @@ */ #include "include/AMRExtractor.h" -#include "include/AVIExtractor.h" #if CHROMIUM_AVAILABLE #include "include/DataUriSource.h" @@ -119,7 +118,6 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer(SniffMPEG2TS); RegisterSniffer(SniffMP3); RegisterSniffer(SniffAAC); - RegisterSniffer(SniffAVI); RegisterSniffer(SniffMPEG2PS); RegisterSniffer(SniffWVM); diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 2171492..c581525 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)) { |