Changeset 161054f3 in ffmpeg

Timestamp:

Aug 1, 2013, 9:29:03 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b3264381

Parents:

bc47d126 (diff), c2e936de (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> (08/01/13 09:06:38)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 09:29:03)

Message:

Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820'

• commit 'c2e936de07d054bf476e60445b453bf6b4836820': tree-test: Refactor and plug memory leaks

Conflicts:

libavutil/tree.c

Most of this commit is not merged due to bugs in it

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

(No files)