diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/truemotion2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/truemotion2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libffmpeg/libavcodec/truemotion2.c b/src/libffmpeg/libavcodec/truemotion2.c index 1b67bd22a..e9bc6b7cb 100644 --- a/src/libffmpeg/libavcodec/truemotion2.c +++ b/src/libffmpeg/libavcodec/truemotion2.c @@ -208,7 +208,7 @@ static inline int tm2_read_header(TM2Context *ctx, uint8_t *buf) obuf = buf; - magic = LE_32(buf); + magic = AV_RL32(buf); buf += 4; if(magic == 0x00000100) { /* old header */ @@ -217,7 +217,7 @@ static inline int tm2_read_header(TM2Context *ctx, uint8_t *buf) } else if(magic == 0x00000101) { /* new header */ int w, h, size, flags, xr, yr; - length = LE_32(buf); + length = AV_RL32(buf); buf += 4; init_get_bits(&ctx->gb, buf, 32 * 8); @@ -270,17 +270,17 @@ static int tm2_read_stream(TM2Context *ctx, uint8_t *buf, int stream_id) { TM2Codes codes; /* get stream length in dwords */ - len = BE_32(buf); buf += 4; cur += 4; + len = AV_RB32(buf); buf += 4; cur += 4; skip = len * 4 + 4; if(len == 0) return 4; - toks = BE_32(buf); buf += 4; cur += 4; + toks = AV_RB32(buf); buf += 4; cur += 4; if(toks & 1) { - len = BE_32(buf); buf += 4; cur += 4; + len = AV_RB32(buf); buf += 4; cur += 4; if(len == TM2_ESCAPE) { - len = BE_32(buf); buf += 4; cur += 4; + len = AV_RB32(buf); buf += 4; cur += 4; } if(len > 0) { init_get_bits(&ctx->gb, buf, (skip - cur) * 8); @@ -291,7 +291,7 @@ static int tm2_read_stream(TM2Context *ctx, uint8_t *buf, int stream_id) { } } /* skip unused fields */ - if(BE_32(buf) == TM2_ESCAPE) { + if(AV_RB32(buf) == TM2_ESCAPE) { buf += 4; cur += 4; /* some unknown length - could be escaped too */ } buf += 4; cur += 4; @@ -312,7 +312,7 @@ static int tm2_read_stream(TM2Context *ctx, uint8_t *buf, int stream_id) { } ctx->tokens[stream_id] = av_realloc(ctx->tokens[stream_id], toks * sizeof(int)); ctx->tok_lens[stream_id] = toks; - len = BE_32(buf); buf += 4; cur += 4; + len = AV_RB32(buf); buf += 4; cur += 4; if(len > 0) { init_get_bits(&ctx->gb, buf, (skip - cur) * 8); for(i = 0; i < toks; i++) |