Merge commit '77b2cd7b'
* commit '77b2cd7b': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '77b2cd7b': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>