1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavutil
Michael Niedermayer 7c888ae746 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>
2013-11-14 15:04:04 +01:00
..
2013-11-03 00:58:31 +01:00
2013-11-03 00:58:31 +01:00
2013-11-04 15:38:52 +01:00
2013-11-04 15:38:52 +01:00
2013-10-29 21:07:45 +01:00
2013-11-03 00:59:38 +01:00
2013-11-03 00:59:38 +01:00