[FFmpeg-cvslog] Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
Michael Niedermayer
git at videolan.org
Fri Oct 12 14:59:05 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 14:52:34 2012 +0200| [f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2] | committer: Michael Niedermayer
Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
Use the new aes/md5/sha/tree allocation functions
avutil: Add functions for allocating opaque contexts for algorithms
svq3: fix pointer type warning
svq3: replace unsafe pointer casting with intreadwrite macros
parseutils-test: various cleanups
Conflicts:
doc/APIchanges
libavcodec/svq3.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2
---
More information about the ffmpeg-cvslog
mailing list