Merge remote-tracking branch 'qatar/master'
* qatar/master: mpegvideo: allocate sufficiently large scratch buffer for interlaced vid Conflicts: libavcodec/mpegvideo.c See: 73db0bf1Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录