Changeset f2387152 in ffmpeg

Timestamp:

Feb 20, 2014, 10:59:09 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

de7b50e9

Parents:

9026c49c (diff), 5c79d2e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (02/20/14 22:58:40)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/20/14 22:59:09)

Message:

Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'

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

Conflicts:

ffmpeg.c

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

(No files)