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

Commit f5c6fcdb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: Duplicate format given to CCodecBufferChannel" into rvc-dev am:... 

Merge "CCodec: Duplicate format given to CCodecBufferChannel" into rvc-dev am: e241b785 am: 5291b392

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

Change-Id: I0344fc4d0b4ea081bc665c0196ae3793a06982b1
parents 2f13acc6 5291b392

media/codec2/sfplugin/CCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1868,7 +1868,7 @@ void CCodec::onMessageReceived(const sp<AMessage> &msg) { 
                config->mInputSurface->onInputBufferDone(work->input.ordinal.frameIndex);

            }

            mChannel->onWorkDone(

                    std::move(work), changed ? config->mOutputFormat : nullptr,

                    std::move(work), changed ? config->mOutputFormat->dup() : nullptr,

                    initData.hasChanged() ? initData.update().get() : nullptr);

            break;

        }