ZLMediaKit / ZLMediaKit

WebRTC/RTSP/RTMP/HTTP/HLS/HTTP-FLV/WebSocket-FLV/HTTP-TS/HTTP-fMP4/WebSocket-TS/WebSocket-fMP4/GB28181/SRT server and client framework based on C++11
https://docs.zlmediakit.com
Other
14.58k stars 3.55k forks source link

修复无法在ffmpeg7.0编译。 #4102

Closed watersounds closed 1 month ago

watersounds commented 1 month ago

ffmpeg中FF_API_OLD_CHANNEL_LAYOUT系列API在2024年3月的提交中已经正式移除了,对应release7.0,使用ffmpeg7.0及以上版本编译zlm会报错。 https://github.com/FFmpeg/FFmpeg/blob/19c95ecbff84eebca254d200c941ce07868ee707/doc/APIchanges#L738-L740

CLAassistant commented 1 month ago

CLA assistant check
All committers have signed the CLA.

xia-chu commented 1 month ago

@watersounds 嗨 感谢您的pr 建议在代码中使用宏来判断版本号,例如这样:

# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
// new api
#else
// old api
#endif

这样代码更简单