Changeset 0c7bd340 in ffmpeg

Timestamp:

Oct 13, 2013, 8:06:42 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d3850ac5

Parents:

77caa31f (diff), fd2384f0 (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 07:56:56)

git-committer:

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

Message:

Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'

• commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937': oggparsevorbis: fail on memory allocation error

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

(No files)