From 2f9b652e8c646eabef74a6742f0d7d4c9118fd0e Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 28 Jul 2015 14:30:33 +0100 Subject: lavu: Drop deprecated context size variables Deprecated in 10/2012. --- libavutil/aes.c | 4 ---- libavutil/aes.h | 4 ---- libavutil/md5.c | 4 ---- libavutil/md5.h | 4 ---- libavutil/sha.c | 4 ---- libavutil/sha.h | 4 ---- libavutil/tree.c | 4 ---- libavutil/tree.h | 3 --- libavutil/version.h | 3 --- 9 files changed, 34 deletions(-) (limited to 'libavutil') diff --git a/libavutil/aes.c b/libavutil/aes.c index 3ba5e9aef4..02a9281b77 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -40,10 +40,6 @@ 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) { return av_mallocz(sizeof(struct AVAES)); diff --git a/libavutil/aes.h b/libavutil/aes.h index edff275b7a..5b451241e4 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -32,10 +32,6 @@ * @{ */ -#if FF_API_CONTEXT_SIZE -extern attribute_deprecated const int av_aes_size; -#endif - struct AVAES; /** diff --git a/libavutil/md5.c b/libavutil/md5.c index efb993e605..f2e9061829 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -42,10 +42,6 @@ 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) { return av_mallocz(sizeof(struct AVMD5)); diff --git a/libavutil/md5.h b/libavutil/md5.h index 29e4e7c2ba..c26318c01d 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -32,10 +32,6 @@ * @{ */ -#if FF_API_CONTEXT_SIZE -extern attribute_deprecated const int av_md5_size; -#endif - struct AVMD5; struct AVMD5 *av_md5_alloc(void); diff --git a/libavutil/sha.c b/libavutil/sha.c index 2d9b58cda6..9e78d19d83 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -40,10 +40,6 @@ 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) { return av_mallocz(sizeof(struct AVSHA)); diff --git a/libavutil/sha.h b/libavutil/sha.h index 4c9a0c9095..86ea0b065e 100644 --- a/libavutil/sha.h +++ b/libavutil/sha.h @@ -32,10 +32,6 @@ * @{ */ -#if FF_API_CONTEXT_SIZE -extern attribute_deprecated const int av_sha_size; -#endif - struct AVSHA; /** diff --git a/libavutil/tree.c b/libavutil/tree.c index d48d01af5b..998851f7f2 100644 --- a/libavutil/tree.c +++ b/libavutil/tree.c @@ -29,10 +29,6 @@ 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) { return av_mallocz(sizeof(struct AVTreeNode)); diff --git a/libavutil/tree.h b/libavutil/tree.h index 424656e06a..e2f191cdd7 100644 --- a/libavutil/tree.h +++ b/libavutil/tree.h @@ -43,9 +43,6 @@ struct AVTreeNode; -#if FF_API_CONTEXT_SIZE -extern attribute_deprecated const int av_tree_node_size; -#endif /** * Allocate an AVTreeNode. diff --git a/libavutil/version.h b/libavutil/version.h index afb64ae0df..3b28b839dc 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -78,9 +78,6 @@ * @{ */ -#ifndef FF_API_CONTEXT_SIZE -#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55) -#endif #ifndef FF_API_LLS_PRIVATE #define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55) #endif -- cgit v1.2.3