Changeset 205b6021 in ffmpeg

Timestamp:

Oct 4, 2013, 12:17:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b8e44118

Parents:

d32eec33 (diff), 72540e51 (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/04/13 12:13:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/04/13 12:17:53)

Message:

Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'

• commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8': rtmpproto: Clear the flv allocation size on reallocp failures

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

(No files)