[FFmpeg-cvslog] Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'

Michael Niedermayer git at videolan.org
Fri Feb 21 00:03:45 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 23:58:40 2014 +0100| [f2387152bcdc4b3a4e650f8b00600796aa0504de] | committer: Michael Niedermayer

Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'

* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
  avconv: Do not divide by zero

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2387152bcdc4b3a4e650f8b00600796aa0504de
---





More information about the ffmpeg-cvslog mailing list