diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2007-01-19 22:12:59 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2007-01-19 22:12:59 +0000 |
| commit | fead30d4440bc7b75006ae60f2742c63a05168b3 (patch) | |
| tree | cead68d924846c1bfb756bb46c86184d889d10db /libavcodec/dvbsubdec.c | |
| parent | 50eaa857c099abda803c803927276d81c2d74edb (diff) | |
| download | ffmpeg-fead30d4440bc7b75006ae60f2742c63a05168b3.tar.gz | |
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index ff43ca6b9e..79da1a60b0 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -851,7 +851,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx, int coding_method, non_modifying_colour; - object_id = BE_16(buf); + object_id = AV_RB16(buf); buf += 2; object = get_object(ctx, object_id); @@ -863,9 +863,9 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx, non_modifying_colour = ((*buf++) >> 1) & 1; if (coding_method == 0) { - top_field_len = BE_16(buf); + top_field_len = AV_RB16(buf); buf += 2; - bottom_field_len = BE_16(buf); + bottom_field_len = AV_RB16(buf); buf += 2; if (buf + top_field_len + bottom_field_len > buf_end) { @@ -1042,9 +1042,9 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, fill = ((*buf++) >> 3) & 1; - region->width = BE_16(buf); + region->width = AV_RB16(buf); buf += 2; - region->height = BE_16(buf); + region->height = AV_RB16(buf); buf += 2; if (region->width * region->height != region->buf_size) { @@ -1086,7 +1086,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, delete_region_display_list(ctx, region); while (buf + 5 < buf_end) { - object_id = BE_16(buf); + object_id = AV_RB16(buf); buf += 2; object = get_object(ctx, object_id); @@ -1106,9 +1106,9 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, display->object_id = object_id; display->region_id = region_id; - display->x_pos = BE_16(buf) & 0xfff; + display->x_pos = AV_RB16(buf) & 0xfff; buf += 2; - display->y_pos = BE_16(buf) & 0xfff; + display->y_pos = AV_RB16(buf) & 0xfff; buf += 2; if ((object->type == 1 || object->type == 2) && buf+1 < buf_end) { @@ -1171,9 +1171,9 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx, display->region_id = region_id; - display->x_pos = BE_16(buf); + display->x_pos = AV_RB16(buf); buf += 2; - display->y_pos = BE_16(buf); + display->y_pos = AV_RB16(buf); buf += 2; *tmp_ptr = display->next; @@ -1405,9 +1405,9 @@ static int dvbsub_decode(AVCodecContext *avctx, { p += 1; segment_type = *p++; - page_id = BE_16(p); + page_id = AV_RB16(p); p += 2; - segment_length = BE_16(p); + segment_length = AV_RB16(p); p += 2; if (page_id == ctx->composition_id || page_id == ctx->ancillary_id) { @@ -1576,7 +1576,7 @@ static int dvbsub_parse(AVCodecParserContext *s, { if (p + 6 <= p_end) { - len = BE_16(p + 4); + len = AV_RB16(p + 4); if (p + len + 6 <= p_end) { |