eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 03:20:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
e66247e926aa270f087a66085b27c4636e8cf57c
ffmpeg/ffmpeg.c
Michael Niedermayer f2387152bc Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05' 
* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
  avconv: Do not divide by zero

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 23:59:09 +01:00

128 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink