Merge commit '48e50921'
* commit '48e50921': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '48e50921': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>