[SCM] libav/experimental: add AV_WB/WL for lswriting, similar to AV_RB/RL (also increment version)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:11 UTC 2013
The following commit has been merged in the experimental branch:
commit a3550abd0847f44beb334ad2dcb65a950cc1a3dc
Author: Alex Beregszaszi <alex at rtfs.hu>
Date: Fri Jan 19 22:26:10 2007 +0000
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
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 08cc615..d5a4570 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -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)
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index c2b4609..e6db5ce 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -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 */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list