Merge commit '47543450'
* commit '47543450': avconv: print verbose per-stream transcoding statistics Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '47543450': avconv: print verbose per-stream transcoding statistics Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>