eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-19 05:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
7c81afdba59f59e2e6d55a1ef72b1f42de8e66fc
ffmpeg/ffmpeg.c
Michael Niedermayer 220bbc44c2 Merge commit '6672f672d98cf4887e13321b6f67682cfd1273b4' into release/2.2 
* commit '6672f672d98cf4887e13321b6f67682cfd1273b4':
  avconv: make -shortest work with streamcopy

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20 00:06:36 +02:00

129 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink