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

Commit 20492274 authored by Andrew Lewis's avatar Andrew Lewis Committed by Automerger Merge Worker
Browse files

Merge "WebmFrameThread: Don't set mDone in WebmFrameSinkThread::stop" am:... 

Merge "WebmFrameThread: Don't set mDone in WebmFrameSinkThread::stop" am: ae14fcc6 am: 5a16ca2a am: c98000a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2439314



Change-Id: Ib919b8c1471e86415ee9095d167d505865841da7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1f813ca c98000a6

media/libstagefright/webm/WebmFrameThread.cpp

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ status_t WebmFrameSinkThread::start() { 
}



status_t WebmFrameSinkThread::stop() {

    mDone = true;

    mVideoFrames.push(WebmFrame::EOS);

    mAudioFrames.push(WebmFrame::EOS);

    return WebmFrameThread::stop();