From 008df0ab85e686bc6aa3e0b989e1d50131aad7f7 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Sun, 4 Aug 2019 23:58:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BB=A7=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MediaFile/TsMuxer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MediaFile/TsMuxer.h b/src/MediaFile/TsMuxer.h index 06230bb5..f639bf6a 100644 --- a/src/MediaFile/TsMuxer.h +++ b/src/MediaFile/TsMuxer.h @@ -38,12 +38,12 @@ using namespace toolkit; namespace mediakit { -class TsMuxer : public MediaSink{ +class TsMuxer { public: TsMuxer(); virtual ~TsMuxer(); - void addTrack(const Track::Ptr &track) override; - void inputFrame(const Frame::Ptr &frame) override ; + void addTrack(const Track::Ptr &track) ; + void inputFrame(const Frame::Ptr &frame) ; protected: virtual void onTs(const void *packet, int bytes,uint32_t timestamp,int flags) = 0; void resetTracks();