Merge commit '85deb51a'
* commit '85deb51a': h264: Only initialize dsputil if error resilience is enabled Conflicts: libavcodec/h264.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '85deb51a': h264: Only initialize dsputil if error resilience is enabled Conflicts: libavcodec/h264.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>