Merge commit '24ad3ac6'
* commit '24ad3ac6': nut: Drop doxygen markers Conflicts: libavformat/nut.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '24ad3ac6': nut: Drop doxygen markers Conflicts: libavformat/nut.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>