highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3537ddb76f3a57f03f95da09dfb0bb2bc2b3e26d
ffmpeg/ffmpeg.c
Michael Niedermayer ac6b5bb834 Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8' 
* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-27 02:06:39 +02:00

137 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink