Commit a3550abd authored by Alex Beregszaszi's avatar Alex Beregszaszi

add AV_WB/WL for lswriting, similar to AV_RB/RL (also increment version)

Originally committed as revision 7588 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fead30d4
......@@ -34,8 +34,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
#define LIBAVUTIL_VERSION_INT ((49<<16)+(1<<8)+0)
#define LIBAVUTIL_VERSION 49.1.0
#define LIBAVUTIL_VERSION_INT ((49<<16)+(2<<8)+0)
#define LIBAVUTIL_VERSION 49.2.0
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
......
......@@ -26,17 +26,40 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed));
#endif /* !__GNUC__ */
/* endian macros */
#if !defined(AV_RB16) || !defined(AV_RB32) || !defined(AV_RL16) || !defined(AV_RL32)
#define AV_RB16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
#define AV_RB32(x) ((((uint8_t*)(x))[0] << 24) | \
#define AV_RB8(x) (((uint8_t*)(x))[0])
#define AV_WB8(p, i, d) { ((uint8_t*)(p))[(i)] = (d); }
#define AV_RB16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
#define AV_WB16(p, i, d) { \
((uint8_t*)(p))[(i)+1] = (d); \
((uint8_t*)(p))[(i)] = (d)>>8; }
#define AV_RB32(x) ((((uint8_t*)(x))[0] << 24) | \
(((uint8_t*)(x))[1] << 16) | \
(((uint8_t*)(x))[2] << 8) | \
((uint8_t*)(x))[3])
#define AV_RL16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
#define AV_RL32(x) ((((uint8_t*)(x))[3] << 24) | \
#define AV_WB32(p, i, d) { \
((uint8_t*)(p))[(i)+3] = (d); \
((uint8_t*)(p))[(i)+2] = (d)>>8; \
((uint8_t*)(p))[(i)+1] = (d)>>16; \
((uint8_t*)(p))[(i)] = (d)>>24; }
#define AV_RL8(x) AV_RB8(x)
#define AV_WL8(p, i, d) AV_WB8(p, i, d)
#define AV_RL16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
#define AV_WL16(p, i, d) { \
((uint8_t*)(p))[(i)] = (d); \
((uint8_t*)(p))[(i)+1] = (d)>>8; }
#define AV_RL32(x) ((((uint8_t*)(x))[3] << 24) | \
(((uint8_t*)(x))[2] << 16) | \
(((uint8_t*)(x))[1] << 8) | \
((uint8_t*)(x))[0])
#endif
#define AV_WL32(p, i, d) { \
((uint8_t*)(p))[(i)] = (d); \
((uint8_t*)(p))[(i)+1] = (d)>>8; \
((uint8_t*)(p))[(i)+2] = (d)>>16; \
((uint8_t*)(p))[(i)+3] = (d)>>24; }
#endif /* INTREADWRITE_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment