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

Commit c0d3a56f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Restrict unsigned integer overflow in MPEG4Writer... 

Merge "Revert "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox"" into main am: b2531368 am: 1cb49573 am: b9645c9e

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



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

media/libstagefright/include/media/stagefright/MPEG4Writer.h

+0 −3
Original line number Diff line number Diff line
@@ -77,9 +77,6 @@ public: 
    virtual void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; }

    virtual int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; }

    virtual status_t setNextFd(int fd);

    bool isSampleMetadataValid([[maybe_unused]] size_t trackIndex, int64_t timeUs) override {

        return timeUs >= 0;

    }



protected:

    virtual ~MPEG4Writer();