cqm
|
03526f141e
|
Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit into feature/transcode2
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
Linux_Python / build (push) Has been cancelled
macOS / build (push) Has been cancelled
macOS_Python / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Windows_Python / build (push) Has been cancelled
# Conflicts:
# conf/config.ini
# src/Codec/Transcode.cpp
# src/Common/MediaSource.h
# src/Common/MultiMediaSourceMuxer.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/macros.h
# webrtc/WebRtcPusher.cpp
# webrtc/WebRtcTransport.cpp
# webrtc/WebRtcTransport.h
|
2026-04-03 09:56:05 +08:00 |
|
xia-chu
|
da9deb352c
|
兼容某些rtsp流sdp中aac config不规范的bug (#4642)
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
|
2026-01-24 23:57:36 +08:00 |
|
cqm
|
06ba39a832
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into feature/transcode2
|
2024-12-02 18:12:57 +08:00 |
|
xia-chu
|
892108d6ba
|
新增若干音视频编码类型的默认实现
部分支持VP8/VP9/AV1/JPEG/MP3/H266/ADPCM/SVAC/G722/G723/G729
|
2024-11-30 08:23:10 +08:00 |
|
xia-chu
|
87b42ab492
|
优化代码
除1024改成右移10位
|
2024-11-29 23:51:34 +08:00 |
|
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 |
|