[FFmpeg-cvslog] Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 15:04:04 2013 +0100| [7c888ae746da0d9f6a11bab9758c01d641b49d7b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c888ae746da0d9f6a11bab9758c01d641b49d7b
---