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

Commit 8f8fd352 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread 

Merge commit '2bf74b8f'

* commit '2bf74b8f':
  Turn off media time adjustment by default
parents 5ca9fa32 2bf74b8f

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1118,7 +1118,7 @@ status_t MPEG4Writer::Track::start(MetaData *params) { 
        startTimeUs = 0;

        startTimeUs = 0;

    }

    }





    mIsRealTimeRecording = true;

    mIsRealTimeRecording = false;

    {

    {

        int32_t isNotRealTime;

        int32_t isNotRealTime;

        if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) {

        if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) {