diff options
| author | James Almer <jamrial@gmail.com> | 2015-09-05 12:58:39 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2015-09-05 13:02:29 -0300 |
| commit | 1a56be9cdc9b541418f850a431271d69af802795 (patch) | |
| tree | c9db354a23eb520a307753b275646762eeabe328 /libavutil/blowfish.h | |
| parent | 8ca97b5e4f470cf24fac5e0599dd63c7af142c22 (diff) | |
| download | ffmpeg-1a56be9cdc9b541418f850a431271d69af802795.tar.gz | |
avutil: undo FF_API_CRYPTO_CONTEXT deprecation for 2.8 release
There's no consensus yet if this deprecation is desired, so it's removed
from this release for the time being
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/blowfish.h')
| -rw-r--r-- | libavutil/blowfish.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h index d163fd3578..29e2747a14 100644 --- a/libavutil/blowfish.h +++ b/libavutil/blowfish.h @@ -31,16 +31,12 @@ * @{ */ -#if FF_API_CRYPTO_CONTEXT #define AV_BF_ROUNDS 16 typedef struct AVBlowfish { uint32_t p[AV_BF_ROUNDS + 2]; uint32_t s[4][256]; } AVBlowfish; -#else -typedef struct AVBlowfish AVBlowfish; -#endif /** * Allocate an AVBlowfish context. |