diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavutil/aes.h | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavutil/aes.h')
| -rw-r--r-- | contrib/ffmpeg/libavutil/aes.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/ffmpeg/libavutil/aes.h b/contrib/ffmpeg/libavutil/aes.h index 34ba0a2fa..438ba170e 100644 --- a/contrib/ffmpeg/libavutil/aes.h +++ b/contrib/ffmpeg/libavutil/aes.h @@ -18,15 +18,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AES_H -#define AES_H +#ifndef FFMPEG_AES_H +#define FFMPEG_AES_H + +#include <stdint.h> extern const int av_aes_size; struct AVAES; /** - * initalizes a AVAES context + * initializes an AVAES context * @param key_bits 128, 192 or 256 * @param decrypt 0 for encryption, 1 for decryption */ @@ -37,9 +39,9 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt); * @param count number of 16 byte blocks * @param dst destination array, can be equal to src * @param src source array, can be equal to dst - * @param iv initalization vector for CBC mode, if NULL then ECB will be used + * @param iv initialization vector for CBC mode, if NULL then ECB will be used * @param decrypt 0 for encryption, 1 for decryption */ void av_aes_crypt(struct AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt); -#endif /* AES_H */ +#endif /* FFMPEG_AES_H */ |