1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
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-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-10-28 08:33:21 -04:00
2013-10-30 11:04:06 +00:00
2013-10-03 23:00:09 +02:00
2013-09-04 16:37:25 +02:00
2013-10-30 23:56:52 +01:00
2013-10-31 20:19:59 +01:00
2013-09-25 16:30:25 +02:00
2013-10-15 17:00:28 +01:00
2013-10-06 20:12:37 +00:00
2013-10-08 12:40:33 +00:00
2013-10-15 23:58:20 +02:00
2013-10-18 16:46:08 +02:00
2013-10-15 22:13:02 +02:00
2013-10-13 21:48:28 +02:00
2013-10-28 23:54:28 +01:00
2013-11-03 01:00:16 +01:00
2013-10-30 12:41:43 +00:00
2013-09-21 16:59:13 +02:00
2013-08-26 19:26:01 +00:00
2013-11-05 13:19:30 +00:00
2013-11-05 13:19:30 +00:00
2013-10-28 23:54:28 +01:00
2013-09-21 16:59:13 +02:00
2013-10-22 19:55:47 +02:00
2013-11-05 12:44:20 +00:00
2013-10-02 21:03:11 -04:00
2013-10-30 11:04:06 +00:00