Changeset a2e50fa in ffmpeg

Timestamp:

Jun 29, 2013, 5:16:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7f866c14

Parents:

2fa89b2 (diff), 225f78b7 (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> (06/29/13 16:27:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/29/13 17:16:49)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

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

(No files)