cqm
|
89e21038c2
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2
# Conflicts:
# src/Common/MediaSource.h
# src/Common/config.h
# src/Rtsp/RtspMediaSourceImp.h
# src/Rtsp/RtspMediaSourceMuxer.h
# src/Rtsp/RtspMuxer.cpp
# webrtc/WebRtcTransport.cpp
|
2024-09-22 11:40:39 +08:00 |
|
alex
|
4152dcd409
|
AI automatically translates all comments in the code into English (#3917)
|
2024-09-19 14:53:50 +08:00 |
|
cqm
|
2ffdfab71e
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2
# Conflicts:
# CMakeLists.txt
# conf/config.ini
# src/Common/MediaSink.cpp
# src/Common/MediaSink.h
# src/Common/MediaSource.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/config.cpp
# src/Common/config.h
# src/Extension/AAC.cpp
# src/Extension/AAC.h
# src/Rtsp/RtpCodec.h
# src/Rtsp/RtspMuxer.cpp
# src/Rtsp/RtspMuxer.h
# webrtc/Nack.cpp
# webrtc/WebRtcTransport.cpp
|
2024-07-15 08:47:30 +08:00 |
|
xia-chu
|
25c99470ee
|
feat: add support of codec plugin
|
2023-12-10 11:09:04 +08:00 |
|