Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b26d97cc authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 

* commit '05d630691127c022befd071b2bede87c707112a9':
  DO NOT MERGE: Remove the AVI extractor.
parents e5bcf5c6 f7b5cdd4

media/libstagefright/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ LOCAL_SRC_FILES:= \ 
        AACWriter.cpp                     \

        AACWriter.cpp                     \

        AMRExtractor.cpp                  \

        AMRExtractor.cpp                  \

        AMRWriter.cpp                     \

        AMRWriter.cpp                     \

        AVIExtractor.cpp                  \

        AudioPlayer.cpp                   \

        AudioPlayer.cpp                   \

        AudioSource.cpp                   \

        AudioSource.cpp                   \

        AwesomePlayer.cpp                 \

        AwesomePlayer.cpp                 \

media/libstagefright/DataSource.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

 */





#include "include/AMRExtractor.h"

#include "include/AMRExtractor.h"

#include "include/AVIExtractor.h"

#include "include/MP3Extractor.h"

#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/WAVExtractor.h"

#include "include/WAVExtractor.h"
@@ -113,7 +112,6 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffMPEG2TS);

    RegisterSniffer(SniffMPEG2TS);

    RegisterSniffer(SniffMP3);

    RegisterSniffer(SniffMP3);

    RegisterSniffer(SniffAAC);

    RegisterSniffer(SniffAAC);

    RegisterSniffer(SniffAVI);

    RegisterSniffer(SniffMPEG2PS);

    RegisterSniffer(SniffMPEG2PS);





    char value[PROPERTY_VALUE_MAX];

    char value[PROPERTY_VALUE_MAX];

media/libstagefright/MediaExtractor.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <utils/Log.h>

#include <utils/Log.h>





#include "include/AMRExtractor.h"

#include "include/AMRExtractor.h"

#include "include/AVIExtractor.h"

#include "include/MP3Extractor.h"

#include "include/MP3Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/MPEG4Extractor.h"

#include "include/WAVExtractor.h"

#include "include/WAVExtractor.h"
@@ -110,8 +109,6 @@ sp<MediaExtractor> MediaExtractor::Create( 
        ret = new MatroskaExtractor(source);

        ret = new MatroskaExtractor(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {

        ret = new MPEG2TSExtractor(source);

        ret = new MPEG2TSExtractor(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_AVI)) {

        ret = new AVIExtractor(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {

        ret = new WVMExtractor(source);

        ret = new WVMExtractor(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {