diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/dvbsubdec.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/dvbsubdec.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/contrib/ffmpeg/libavcodec/dvbsubdec.c b/contrib/ffmpeg/libavcodec/dvbsubdec.c index ff43ca6b9..08ef6213e 100644 --- a/contrib/ffmpeg/libavcodec/dvbsubdec.c +++ b/contrib/ffmpeg/libavcodec/dvbsubdec.c @@ -32,7 +32,7 @@ #define DVBSUB_OBJECT_SEGMENT 0x13 #define DVBSUB_DISPLAY_SEGMENT 0x80 -static unsigned char *cm; +#define cm (ff_cropTbl + MAX_NEG_CROP) #ifdef DEBUG_SAVE_IMAGES #undef fprintf @@ -344,8 +344,6 @@ static int dvbsub_init_decoder(AVCodecContext *avctx) int i, r, g, b, a = 0; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; - cm = ff_cropTbl + MAX_NEG_CROP; - memset(avctx->priv_data, 0, sizeof(DVBSubContext)); ctx->composition_id = avctx->sub_id & 0xffff; @@ -851,7 +849,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 +861,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 +1040,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 +1084,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 +1104,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 +1169,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 +1403,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 +1574,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) { |