From c1e124786c6de5b0a26df7e4a640990abea6e76e Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 28 Mar 2020 20:57:03 +0800 Subject: [PATCH] For #307, fix build warnings for rtc --- trunk/3rdparty/ffmpeg-4.2-fit/.gitignore | 3 ++- trunk/src/kernel/srs_kernel_mp4.cpp | 4 ++-- trunk/src/kernel/srs_kernel_mp4.hpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/trunk/3rdparty/ffmpeg-4.2-fit/.gitignore b/trunk/3rdparty/ffmpeg-4.2-fit/.gitignore index 9ce1b69cd..23594d913 100644 --- a/trunk/3rdparty/ffmpeg-4.2-fit/.gitignore +++ b/trunk/3rdparty/ffmpeg-4.2-fit/.gitignore @@ -15,4 +15,5 @@ libavutil/lib.version libavcodec/libavcodec.version libavutil/libavutil.version libswresample/libswresample.version -libavutil/ffversion.h \ No newline at end of file +libavutil/ffversion.h +libavutil/avconfig.h diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index 5cfc5ac9f..93d7bb544 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -2744,7 +2744,7 @@ SrsMp4DataEntryBox* SrsMp4DataReferenceBox::entry_at(int index) return entries.at(index); } -SrsMp4DataReferenceBox* SrsMp4DataReferenceBox::append(SrsMp4DataEntryBox* v) +SrsMp4DataReferenceBox* SrsMp4DataReferenceBox::append2(SrsMp4DataEntryBox* v) { entries.push_back(v); return this; @@ -3765,7 +3765,7 @@ SrsMp4SampleEntry* SrsMp4SampleDescriptionBox::entrie_at(int index) return entries.at(index); } -SrsMp4SampleDescriptionBox* SrsMp4SampleDescriptionBox::append(SrsMp4SampleEntry* v) +SrsMp4SampleDescriptionBox* SrsMp4SampleDescriptionBox::append2(SrsMp4SampleEntry* v) { entries.push_back(v); return this; diff --git a/trunk/src/kernel/srs_kernel_mp4.hpp b/trunk/src/kernel/srs_kernel_mp4.hpp index 161f2c032..3b9ceefa7 100644 --- a/trunk/src/kernel/srs_kernel_mp4.hpp +++ b/trunk/src/kernel/srs_kernel_mp4.hpp @@ -1173,7 +1173,7 @@ public: public: virtual uint32_t entry_count(); virtual SrsMp4DataEntryBox* entry_at(int index); - virtual SrsMp4DataReferenceBox* append(SrsMp4DataEntryBox* v); + virtual SrsMp4DataReferenceBox* append2(SrsMp4DataEntryBox* v); protected: virtual int nb_header(); virtual srs_error_t encode_header(SrsBuffer* buf); @@ -1520,7 +1520,7 @@ public: public: virtual uint32_t entry_count(); virtual SrsMp4SampleEntry* entrie_at(int index); - virtual SrsMp4SampleDescriptionBox* append(SrsMp4SampleEntry* v); + virtual SrsMp4SampleDescriptionBox* append2(SrsMp4SampleEntry* v); protected: virtual int nb_header(); virtual srs_error_t encode_header(SrsBuffer* buf);