Changeset 7fd7a10e in ffmpeg

Timestamp:

Oct 30, 2013, 9:41:06 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

62ef736f

Parents:

0b9e480 (diff), 4f2d8968 (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> (10/30/13 09:40:48)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/30/13 09:41:06)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: oggparsetheora: check av_mallocz result

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

(No files)