---
libavcodec/bytestream.h | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 49d7fa4..7dde502 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -37,11 +37,13 @@ typedef struct {
} PutByteContext;
#define DEF_T(type, name, bytes, read, write) \
-static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
+static av_always_inline type bytestream_get_ ## name(const uint8_t **b)\
+{\
(*b) += bytes;\
return read(*b - bytes);\
}\
-static av_always_inline void bytestream_put_ ##name(uint8_t **b, const type
value){\
+static av_always_inline void bytestream_put_ ## name(uint8_t **b, const type
value)\
+{\
write(*b, value);\
(*b) += bytes;\
}\
@@ -49,7 +51,8 @@ static av_always_inline void bytestream2_put_ ## name ##
u(PutByteContext *p, co
{\
bytestream_put_ ## name(&p->buffer, value);\
}\
-static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, const
type value){\
+static av_always_inline void bytestream2_put_ ## name(PutByteContext *p, const
type value)\
+{\
if (!p->eof && (p->buffer_end - p->buffer >= bytes)) {\
write(p->buffer, value);\
p->buffer += bytes;\
@@ -131,9 +134,9 @@ DEF (byte, 1, AV_RB8 , AV_WB8 )
static av_always_inline void bytestream2_init(GetByteContext *g,
const uint8_t *buf, int buf_size)
{
- g->buffer = buf;
+ g->buffer = buf;
g->buffer_start = buf;
- g->buffer_end = buf + buf_size;
+ g->buffer_end = buf + buf_size;
}
static av_always_inline void bytestream2_init_writer(PutByteContext *p,
@@ -280,14 +283,18 @@ static av_always_inline unsigned int
bytestream2_get_eof(PutByteContext *p)
return p->eof;
}
-static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b,
uint8_t *dst, unsigned int size)
+static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b,
+ uint8_t *dst,
+ unsigned int size)
{
memcpy(dst, *b, size);
(*b) += size;
return size;
}
-static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t
*src, unsigned int size)
+static av_always_inline void bytestream_put_buffer(uint8_t **b,
+ const uint8_t *src,
+ unsigned int size)
{
memcpy(*b, src, size);
(*b) += size;
--
1.7.4.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
