virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

Browse Source 
* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-06-05 11:19:16 +02:00
parent ea038b996d 3b4feac1ec
commit 30b491f1c9
6 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@@ -16,6 +16,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2013-06-05 - fc962d4 - lavu 52.13.0 - mem.h
Add av_realloc_array and av_reallocp_array
2013-05-24 - xxxxxxx - lavfi 3.70.100 - avfilter.h
Add support for slice multithreading to lavfi. Filters supporting threading
are marked with AVFILTER_FLAG_SLICE_THREADS.