Browse Source

lavu: keep context size variables

They are essential to be able to use the utils without av_malloc()
That is for example use with malloc(), memalign(), some other
private allocation function, on the stack or others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer 12 years ago
parent
commit
ac090fa68c
9 changed files with 4 additions and 21 deletions
  1. 0 1
      doc/APIchanges
  2. 0 2
      libavutil/aes.c
  3. 1 3
      libavutil/aes.h
  4. 0 2
      libavutil/md5.c
  5. 1 3
      libavutil/md5.h
  6. 0 2
      libavutil/sha.c
  7. 1 3
      libavutil/sha.h
  8. 0 2
      libavutil/tree.c
  9. 1 3
      libavutil/tree.h

+ 0 - 1
doc/APIchanges

@@ -114,7 +114,6 @@ API changes, most recent first:
 
 2012-10-xx - xxxxxxx - lavu 51.43.0 - aes.h, md5.h, sha.h, tree.h
   Add functions for allocating the opaque contexts for the algorithms,
-  deprecate the context size variables.
 
 2012-10-xx - xxxxxxx - lavf 54.18.0 - avio.h
   Add avio_closep to complement avio_close.

+ 0 - 2
libavutil/aes.c

@@ -39,9 +39,7 @@ typedef struct AVAES {
     int rounds;
 } AVAES;
 
-#if FF_API_CONTEXT_SIZE
 const int av_aes_size= sizeof(AVAES);
-#endif
 
 struct AVAES *av_aes_alloc(void)
 {

+ 1 - 3
libavutil/aes.h

@@ -32,9 +32,7 @@
  * @{
  */
 
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_aes_size;
-#endif
+extern const int av_aes_size;
 
 struct AVAES;
 

+ 0 - 2
libavutil/md5.c

@@ -42,9 +42,7 @@ typedef struct AVMD5{
     uint32_t ABCD[4];
 } AVMD5;
 
-#if FF_API_CONTEXT_SIZE
 const int av_md5_size = sizeof(AVMD5);
-#endif
 
 struct AVMD5 *av_md5_alloc(void)
 {

+ 1 - 3
libavutil/md5.h

@@ -32,9 +32,7 @@
  * @{
  */
 
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_md5_size;
-#endif
+extern const int av_md5_size;
 
 struct AVMD5;
 

+ 0 - 2
libavutil/sha.c

@@ -38,9 +38,7 @@ typedef struct AVSHA {
     void     (*transform)(uint32_t *state, const uint8_t buffer[64]);
 } AVSHA;
 
-#if FF_API_CONTEXT_SIZE
 const int av_sha_size = sizeof(AVSHA);
-#endif
 
 struct AVSHA *av_sha_alloc(void)
 {

+ 1 - 3
libavutil/sha.h

@@ -32,9 +32,7 @@
  * @{
  */
 
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_sha_size;
-#endif
+extern const int av_sha_size;
 
 struct AVSHA;
 

+ 0 - 2
libavutil/tree.c

@@ -28,9 +28,7 @@ typedef struct AVTreeNode {
     int state;
 } AVTreeNode;
 
-#if FF_API_CONTEXT_SIZE
 const int av_tree_node_size = sizeof(AVTreeNode);
-#endif
 
 struct AVTreeNode *av_tree_node_alloc(void)
 {

+ 1 - 3
libavutil/tree.h

@@ -43,9 +43,7 @@
 
 
 struct AVTreeNode;
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_tree_node_size;
-#endif
+extern const int av_tree_node_size;
 
 /**
  * Allocate an AVTreeNode.