Merge commit 'baeb59d8'
* commit 'baeb59d8': avconv: rewrite output data size tracking Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit 'baeb59d8': avconv: rewrite output data size tracking Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>