Changeset cff55cfe in ffmpeg

Timestamp:

Mar 22, 2015, 3:02:25 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aa65ff2a

Parents:

c75681ab (diff), 27aa1ff3 (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> (03/22/15 03:00:56)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/22/15 03:02:25)

Message:

Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f'

• commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f': oggdec: Check memory allocation

Conflicts:

libavformat/oggdec.c

See: 9b8152bf047bbebe4495b993258591687bcdd36d an others
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)