external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from srs2

Browse source
This commit is contained in:
winlin 2015-10-01 13:05:25 +08:00
commit 8862ec1988
14 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/kernel/srs_kernel_codec.hpp
View file

@ -525,6 +525,8 @@ enum SrsAvcLevel
};
std::string srs_codec_avc_level2str(SrsAvcLevel level);
#if !defined(SRS_EXPORT_LIBRTMP)
/**
* the h264/avc and aac codec, for media stream.
*
@ -663,3 +665,6 @@ private:
};
#endif
#endif