summaryrefslogtreecommitdiff
path: root/libavutil/blowfish.h
diff options
context:
space:
mode:
Diffstat (limited to 'libavutil/blowfish.h')
-rw-r--r--libavutil/blowfish.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h
index 4f86bf7cfb..9e289a40da 100644
--- a/libavutil/blowfish.h
+++ b/libavutil/blowfish.h
@@ -1,20 +1,21 @@
/*
* Blowfish algorithm
+ * Copyright (c) 2012 Samuel Pitoiset
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -22,7 +23,6 @@
#define AVUTIL_BLOWFISH_H
#include <stdint.h>
-#include "version.h"
/**
* @defgroup lavu_blowfish Blowfish
@@ -30,16 +30,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.