Changeset fb7b5dc0 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8b94cee9

Parents:

3377f6fd (diff), 41658bc8 (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/01/15 00:10:30)

git-committer:

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

Message:

Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'

• commit '41658bc88553dab8499e4dfca311559dcbae2674': libtheora: Check memory allocation

Conflicts:

libavcodec/libtheoraenc.c

See: 67d4d5f5db060fece8cc8e925f18f0a1c48813c6
See: 27216bf314c62125c408be1a5a79e5c9dba88e76
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)