Merge remote branch 'qatar/master'

[ffmpeg] / libavutil / aes.h

diff --git a/libavutil/aes.h b/libavutil/aes.h
index 39a38b724d3051a9dbc2a6dd18666077fa6a0d1e..368f70cbbb6ec2e1e0dde0e7fca2f269f70bab0b 100644 (file)
--- a/libavutil/aes.h
+++ b/libavutil/aes.h
@@ -18,28 +18,30 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AES_H
-#define AES_H
+#ifndef AVUTIL_AES_H
+#define AVUTIL_AES_H
+
+#include <stdint.h>
 
 extern const int av_aes_size;
 
 struct AVAES;
 
 /**
- * initializes an AVAES context
+ * Initialize an AVAES context.
  * @param key_bits 128, 192 or 256
  * @param decrypt 0 for encryption, 1 for decryption
  */
 int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
 
 /**
- * encrypts / decrypts.
+ * Encrypt or decrypt a buffer using a previously initialized context.
  * @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 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);
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
 
-#endif /* AES_H */
+#endif /* AVUTIL_AES_H */