diff options
| -rw-r--r-- | doc/APIchanges | 1 | ||||
| -rw-r--r-- | libavutil/aes.c | 2 | ||||
| -rw-r--r-- | libavutil/aes.h | 4 | ||||
| -rw-r--r-- | libavutil/md5.c | 2 | ||||
| -rw-r--r-- | libavutil/md5.h | 4 | ||||
| -rw-r--r-- | libavutil/sha.c | 2 | ||||
| -rw-r--r-- | libavutil/sha.h | 4 | ||||
| -rw-r--r-- | libavutil/tree.c | 2 | ||||
| -rw-r--r-- | libavutil/tree.h | 4 |
9 files changed, 4 insertions, 21 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index fd38aa0671..aa828464bd 100644 --- a/doc/APIchanges +++ b/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. diff --git a/libavutil/aes.c b/libavutil/aes.c index 555cbb82cf..a3eb295e24 100644 --- a/libavutil/aes.c +++ b/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) { diff --git a/libavutil/aes.h b/libavutil/aes.h index 9c1a54e036..09efbda107 100644 --- a/libavutil/aes.h +++ b/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; diff --git a/libavutil/md5.c b/libavutil/md5.c index ce8400fdac..d0d0d27f07 100644 --- a/libavutil/md5.c +++ b/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) { diff --git a/libavutil/md5.h b/libavutil/md5.h index 69199cc53c..1d7be9ff53 100644 --- a/libavutil/md5.h +++ b/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; diff --git a/libavutil/sha.c b/libavutil/sha.c index e3a956a4b5..8d5ca458f9 100644 --- a/libavutil/sha.c +++ b/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) { diff --git a/libavutil/sha.h b/libavutil/sha.h index 744c66f5d9..bf4377e51b 100644 --- a/libavutil/sha.h +++ b/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; diff --git a/libavutil/tree.c b/libavutil/tree.c index cba6fe8c78..5803c2a881 100644 --- a/libavutil/tree.c +++ b/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) { diff --git a/libavutil/tree.h b/libavutil/tree.h index 71874967f9..13fb91be50 100644 --- a/libavutil/tree.h +++ b/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. |