Changeset 7c888ae in ffmpeg

Timestamp:

Nov 14, 2013, 2:04:04 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1ac4797d

Parents:

2925571 (diff), cce3e0a4 (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.

Message:

Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'

• commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4': Move av_fast_{m,re}alloc from lavc to lavu.

Conflicts:

libavcodec/avcodec.h
libavcodec/utils.c
libavutil/mem.c
libavutil/version.h

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

(No files)