Diego Biurrun <[email protected]> writes: > --- > libavcodec/bytestream.h | 28 ++++++++++------------------ > 1 files changed, 10 insertions(+), 18 deletions(-) > > diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h > index 6814620..aa93f5a 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" > @@ -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_T(uint64_t, le64, 8, AV_RL64, AV_WL64) > +DEF_T(unsigned int, le32, 4, AV_RL32, AV_WL32) > +DEF_T(unsigned int, le24, 3, AV_RL24, AV_WL24) > +DEF_T(unsigned int, le16, 2, AV_RL16, AV_WL16) > +DEF_T(uint64_t, be64, 8, AV_RB64, AV_WB64) > +DEF_T(unsigned int, be32, 4, AV_RB32, AV_WB32) > +DEF_T(unsigned int, be24, 3, AV_RB24, AV_WB24) > +DEF_T(unsigned int, be16, 2, AV_RB16, AV_WB16) > +DEF_T(unsigned int, byte, 1, AV_RB8 , AV_WB8 )
Why DEF_T? You're removing the DEF macro so you might as well reuse that name. -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
