Changeset c74c3fb1 in ffmpeg

Timestamp:

Sep 17, 2013, 9:06:26 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0483cfe

Parents:

ede42109 (diff), 3feb3d6c (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> (09/17/13 09:05:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/17/13 09:06:26)

Message:

Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'

• commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7': mem: Introduce av_reallocp

Conflicts:

doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h

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

(No files)