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

Commit 15962000 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

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



Change-Id: I504bf2f8996781ddef9403a66e8c96733d45609d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 45aa078b b2531368

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();