Mercurial > libavformat.hg
diff aviobuf.c @ 822:2614d3c1f415 libavformat
kill duplicated get/put_be24()
author | michael |
---|---|
date | Tue, 19 Jul 2005 14:41:08 +0000 |
parents | 46d81c56df9b |
children | e8b4454b997d |
line wrap: on
line diff
--- a/aviobuf.c Tue Jul 19 14:26:41 2005 +0000 +++ b/aviobuf.c Tue Jul 19 14:41:08 2005 +0000 @@ -253,6 +253,12 @@ put_byte(s, val); } +void put_be24(ByteIOContext *s, unsigned int val) +{ + put_be16(s, val >> 8); + put_byte(s, val); +} + void put_tag(ByteIOContext *s, const char *tag) { while (*tag) { @@ -407,10 +413,8 @@ unsigned int get_le32(ByteIOContext *s) { unsigned int val; - val = get_byte(s); - val |= get_byte(s) << 8; - val |= get_byte(s) << 16; - val |= get_byte(s) << 24; + val = get_le16(s); + val |= get_le16(s) << 16; return val; } @@ -430,13 +434,18 @@ return val; } +unsigned int get_be24(ByteIOContext *s) +{ + unsigned int val; + val = get_be16(s) << 8; + val |= get_byte(s); + return val; +} unsigned int get_be32(ByteIOContext *s) { unsigned int val; - val = get_byte(s) << 24; - val |= get_byte(s) << 16; - val |= get_byte(s) << 8; - val |= get_byte(s); + val = get_be16(s) << 16; + val |= get_be16(s); return val; }