Merge commit '86d9181c'
* commit '86d9181c': rtpdec: Support sending RTCP feedback packets Conflicts: libavformat/version.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '86d9181c': rtpdec: Support sending RTCP feedback packets Conflicts: libavformat/version.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>