ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Aug 10
20:51:15 2014 +0200| [bd879652476b1d57628f09531038ef4487fd68a6] | committer:
Michael Niedermayer
Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
lavc: drop the av_fast_{re,m}alloc compatibility wrappers
Conflicts:
libavcodec/utils.c
See: a973e01501bc3ca5c61d778f97f350837d4ed481
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd879652476b1d57628f09531038ef4487fd68a6
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
