1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
Michael Niedermayer c74c3fb142 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>
2013-09-17 11:06:26 +02:00
..
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-04-13 23:48:26 +02:00
2013-06-16 12:49:39 +02:00
2013-06-15 18:49:12 -03:00
2013-06-12 01:47:42 +02:00
2013-08-10 18:17:30 +02:00
2013-06-15 02:22:39 +02:00
2013-05-15 12:10:09 +02:00
2013-05-13 21:42:37 +02:00
2013-08-12 19:40:29 +02:00
2013-04-15 20:31:06 +02:00
2013-06-15 18:54:01 -03:00
2013-06-02 11:27:19 +02:00
2013-06-13 14:57:00 +02:00
2013-08-01 11:29:12 +02:00