-
由 Michael Niedermayer 提交于
* commit '48e50921': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
52ce6be8
* commit '48e50921': avconv: make -shortest work with streamcopy Conflicts: ffmpeg.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>