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

Commit 8d598654 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Fix the file mimetype reported by the mpeg4 extractor."

parents 00da68de 6f64c90c

media/libstagefright/MPEG4Extractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ status_t MPEG4Extractor::readMetaData() { 


    if (mInitCheck == OK) {

        if (mHasVideo) {

            mFileMetaData->setCString(kKeyMIMEType, "video/mp4");

            mFileMetaData->setCString(

                    kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_MPEG4);

        } else {

            mFileMetaData->setCString(kKeyMIMEType, "audio/mp4");

        }

media/libstagefright/MediaDefs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; 
const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts";



const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";

const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";

const char *MEDIA_MIMETYPE_CONTAINER_OGG = "application/ogg";

const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA = "video/x-matroska";