diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-03-16 18:41:29 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-03-18 16:07:32 +0100 |
| commit | f03183d9a80e898a9a73b8a02645c19c05a790a9 (patch) | |
| tree | 24e1ea07f76e5edbda799cb09a3741577fa6c7ca | |
| parent | abe3c697a3bb5bef77f90f8b0f799b652167df60 (diff) | |
| download | ffmpeg-f03183d9a80e898a9a73b8a02645c19c05a790a9.tar.gz | |
bytestream: Eliminate one level of pointless macro indirection.
| -rw-r--r-- | libavcodec/bytestream.h | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index 68146200ae..444f758e5d 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -23,6 +23,7 @@ #ifndef AVCODEC_BYTESTREAM_H #define AVCODEC_BYTESTREAM_H +#include <stdint.h> #include <string.h> #include "libavutil/common.h" @@ -37,7 +38,7 @@ typedef struct { int eof; } PutByteContext; -#define DEF_T(type, name, bytes, read, write) \ +#define DEF(type, name, bytes, read, write) \ static av_always_inline type bytestream_get_ ## name(const uint8_t **b) \ { \ (*b) += bytes; \ @@ -80,24 +81,15 @@ static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g) \ return read(g->buffer); \ } -#define DEF(name, bytes, read, write) \ - DEF_T(unsigned int, name, bytes, read, write) -#define DEF64(name, bytes, read, write) \ - DEF_T(uint64_t, name, bytes, read, write) - -DEF64(le64, 8, AV_RL64, AV_WL64) -DEF (le32, 4, AV_RL32, AV_WL32) -DEF (le24, 3, AV_RL24, AV_WL24) -DEF (le16, 2, AV_RL16, AV_WL16) -DEF64(be64, 8, AV_RB64, AV_WB64) -DEF (be32, 4, AV_RB32, AV_WB32) -DEF (be24, 3, AV_RB24, AV_WB24) -DEF (be16, 2, AV_RB16, AV_WB16) -DEF (byte, 1, AV_RB8 , AV_WB8 ) - -#undef DEF -#undef DEF64 -#undef DEF_T +DEF(uint64_t, le64, 8, AV_RL64, AV_WL64) +DEF(unsigned int, le32, 4, AV_RL32, AV_WL32) +DEF(unsigned int, le24, 3, AV_RL24, AV_WL24) +DEF(unsigned int, le16, 2, AV_RL16, AV_WL16) +DEF(uint64_t, be64, 8, AV_RB64, AV_WB64) +DEF(unsigned int, be32, 4, AV_RB32, AV_WB32) +DEF(unsigned int, be24, 3, AV_RB24, AV_WB24) +DEF(unsigned int, be16, 2, AV_RB16, AV_WB16) +DEF(unsigned int, byte, 1, AV_RB8 , AV_WB8) #if HAVE_BIGENDIAN # define bytestream2_get_ne16 bytestream2_get_be16 |