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

Commit 46bc4f0c authored by Divya Sharma's avatar Divya Sharma Committed by Linux Build Service Account
Browse files

frameworks/av: Add back removed line from a conflict resolution 

Add back the removed line from a conflict resolution

Change-Id: Iee2912f92cb5785024403e17c1b5532344670b40
parent 63f9f8a7

media/libstagefright/MPEG4Writer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2379,6 +2379,8 @@ status_t MPEG4Writer::Track::threadEntry() { 
            continue;

        }



        ++nActualFrames;



        MediaBuffer *copy = NULL;

        // Check if the upstream source hints it is OK to hold on to the

        // buffer without releasing immediately and avoid cloning the buffer