Changeset 68ed0b6c in ffmpeg

Timestamp:

Jan 17, 2014, 3:57:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ee27b113

Parents:

f1edf881 (diff), ee3fc8aa (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> (01/17/14 15:57:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/17/14 15:57:49)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Fix libxvid crash on failing initialisation.

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

(No files)