Changeset 3ce0edde in ffmpeg

Timestamp:

Oct 13, 2013, 6:53:47 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8dbf98e6

Parents:

b6ffe8af (diff), ed9245db (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/13/13 06:43:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/13/13 06:53:47)

Message:

Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'

• commit 'ed9245dba83f9add60f55718b537b0af2105c60e': oggparsevorbis: check allocations

Conflicts:

libavformat/oggparsevorbis.c

See: 033f1644b59abd755bb529afa5db394d18d9c30b
See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)