external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

For #307, fix build warnings for rtc

Browse source
This commit is contained in:
winlin 2020-03-28 20:57:03 +08:00
parent dae7af8444
commit c1e124786c
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
trunk/3rdparty/ffmpeg-4.2-fit/.gitignore vendored
View file

@ -15,4 +15,5 @@ libavutil/lib.version
libavcodec/libavcodec.version
libavutil/libavutil.version
libswresample/libswresample.version
libavutil/ffversion.h
libavutil/ffversion.h
libavutil/avconfig.h

4
trunk/src/kernel/srs_kernel_mp4.cpp
View file

@ -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;

4
trunk/src/kernel/srs_kernel_mp4.hpp
View file

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