Merge commit '03ca6d70'
* commit '03ca6d70': x264: Factor out the reconfiguration code Conflicts: libavcodec/libx264.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '03ca6d70': x264: Factor out the reconfiguration code Conflicts: libavcodec/libx264.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>