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

Commit 7ac00396 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Remove the last of the references."

parents 49869253 0e03cf07

include/ndk/NdkMediaMuxer.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ media_status_t AMediaMuxer_stop(AMediaMuxer*); 
 * by the encoder.)

 */

media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer,

        size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info);

        size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo *info);



#ifdef __cplusplus

} // extern "C"

media/ndk/NdkMediaMuxer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -96,10 +96,10 @@ media_status_t AMediaMuxer_stop(AMediaMuxer *muxer) { 


EXPORT

media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer,

        size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info) {

    sp<ABuffer> buf = new ABuffer((void*)(data + info.offset), info.size);

        size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo *info) {

    sp<ABuffer> buf = new ABuffer((void*)(data + info->offset), info->size);

    return translate_error(

            muxer->mImpl->writeSampleData(buf, trackIdx, info.presentationTimeUs, info.flags));

            muxer->mImpl->writeSampleData(buf, trackIdx, info->presentationTimeUs, info->flags));

}