Changeset 3377f6fd in ffmpeg

Timestamp:

Jun 1, 2015, 12:00:29 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fb7b5dc0

Parents:

513673a8 (diff), 8df5fbf0 (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> (05/31/15 23:59:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/01/15 00:00:29)

Message:

Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'

• commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47': lcl: Check memory allocation

Conflicts:

libavcodec/lclenc.c

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

(No files)