diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:19:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:25:23 +0200 |
| commit | 18b0c39f99eee508107c47345494e535b8757434 (patch) | |
| tree | b1418e52aab2f1fb8a171c3bb3fada3c7b0df531 /libavutil/xtea.h | |
| parent | d9d0c1ccc3df39fecbbbb6b600c18542741c5a51 (diff) | |
| parent | 05c36e0e5fbf0b75dbbbd327ad2f6a62992f9262 (diff) | |
| download | ffmpeg-18b0c39f99eee508107c47345494e535b8757434.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: fix addition overflow
g723.1: simplify and fix multiplication overflow
g723.1: deobfuscate an expression
g723.1: remove unused #includes
ARM: add missing "cc" clobber in av_clipl_int32_arm()
rtmp: Factorize the code by adding handle_invoke_error
rtmp: Factorize the code by adding handle_invoke_status
rtmp: Factorize the code by adding handle_invoke_result
libavutil: remove unused av_abort() macro
ffmenc: replace if/abort with assert()
libavutil: drop offsetof() fallback definition
libavutil: drop fallback definitions of INTxx_MIN/MAX
configure: Check for a sctp struct instead of just the header
configure: suncc: Add -xc99 to dependency flags, required on Solaris
doxygen: Fix function parameter names to match the code
doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
swf: Move shared table out of the header file
swf: Move swf_audio_codec_tags table to the only place it is used
fate: add G.723.1 decoder tests
Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xtea.h')
| -rw-r--r-- | libavutil/xtea.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/xtea.h b/libavutil/xtea.h index 17fb47ac05..0899c92bc8 100644 --- a/libavutil/xtea.h +++ b/libavutil/xtea.h @@ -37,7 +37,7 @@ typedef struct AVXTEA { /** * Initialize an AVXTEA context. * - * @param x an AVXTEA context + * @param ctx an AVXTEA context * @param key a key of 16 bytes used for encryption/decryption */ void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]); @@ -45,7 +45,7 @@ void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]); /** * Encrypt or decrypt a buffer using a previously initialized context. * - * @param x an AVXTEA context + * @param ctx an AVXTEA context * @param dst destination array, can be equal to src * @param src source array, can be equal to dst * @param count number of 8 byte blocks |