diff options
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/intmath.h | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 40 | ||||
| -rw-r--r-- | libavutil/xtea.h | 4 |
3 files changed, 3 insertions, 43 deletions
diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h index ebcb538cc5..4af4bf32d1 100644 --- a/libavutil/arm/intmath.h +++ b/libavutil/arm/intmath.h @@ -108,7 +108,7 @@ static av_always_inline av_const int32_t av_clipl_int32_arm(int64_t a) "mvnne %1, #1<<31 \n\t" "moveq %0, %Q2 \n\t" "eorne %0, %1, %R2, asr #31 \n\t" - : "=r"(x), "=&r"(y) : "r"(a):"cc"); + : "=r"(x), "=&r"(y) : "r"(a) : "cc"); return x; } diff --git a/libavutil/internal.h b/libavutil/internal.h index 502effe0b7..c56aca6d07 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -53,50 +53,10 @@ struct AVDictionary { #endif #endif -#ifndef INT16_MIN -#define INT16_MIN (-0x7fff - 1) -#endif - -#ifndef INT16_MAX -#define INT16_MAX 0x7fff -#endif - -#ifndef INT32_MIN -#define INT32_MIN (-0x7fffffff - 1) -#endif - -#ifndef INT32_MAX -#define INT32_MAX 0x7fffffff -#endif - -#ifndef UINT32_MAX -#define UINT32_MAX 0xffffffff -#endif - -#ifndef INT64_MIN -#define INT64_MIN (-0x7fffffffffffffffLL - 1) -#endif - -#ifndef INT64_MAX -#define INT64_MAX INT64_C(9223372036854775807) -#endif - -#ifndef UINT64_MAX -#define UINT64_MAX UINT64_C(0xFFFFFFFFFFFFFFFF) -#endif - #ifndef INT_BIT # define INT_BIT (CHAR_BIT * sizeof(int)) #endif -#ifndef offsetof -# define offsetof(T, F) ((unsigned int)((char *)&((T *)0)->F)) -#endif - -/* debug stuff */ - -#define av_abort() do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0) - /* avoid usage of dangerous/inappropriate system functions */ #undef malloc #define malloc please_use_av_malloc 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 |