merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/3rdparty/include/ffmpeg_/libavutil/adler32.h
+++ b/3rdparty/include/ffmpeg_/libavutil/adler32.h
@@ -25,6 +25,7 @@
 #include "attributes.h"

 /**
+ * @ingroup lavu_crypto
 * Calculate the Adler32 checksum of a buffer.
 *
 * Passing the return value to a subsequent av_adler32_update() call