mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-22 23:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/chainable-rtcp-handlers

Browse Source 
# Conflicts:
#	src/h264packetizationhandler.cpp
This commit is contained in:
Filip Klembara
2021-02-08 10:19:26 +01:00
parent 09dfc39fd9 986e5f985f
commit 36a88c605a
35 changed files with 260 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/rtc/h264rtppacketizer.hpp
View File

@ -16,8 +16,8 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef H264RtpPacketizer_hpp
#define H264RtpPacketizer_hpp
#ifndef H264_RTP_PACKETIZER_H
#define H264_RTP_PACKETIZER_H
#if RTC_ENABLE_MEDIA
@ -64,4 +64,4 @@ private:
#endif /* RTC_ENABLE_MEDIA */
#endif /* H264RtpPacketizer_hpp */
#endif /* H264_RTP_PACKETIZER_H */