Revision cedb83a6 libavcodec/dvbsubdec.c

View differences:

libavcodec/dvbsubdec.c
172 172
    int x_pos;
173 173
    int y_pos;
174 174

  
175
    int fgcolour;
176
    int bgcolour;
175
    int fgcolor;
176
    int bgcolor;
177 177

  
178 178
    struct DVBSubObjectDisplay *region_list_next;
179 179
    struct DVBSubObjectDisplay *object_list_next;
......
206 206
    int depth;
207 207

  
208 208
    int clut;
209
    int bgcolour;
209
    int bgcolor;
210 210

  
211 211
    uint8_t *pbuf;
212 212
    int buf_size;
......
844 844
    DVBSubObjectDisplay *display;
845 845
    int top_field_len, bottom_field_len;
846 846

  
847
    int coding_method, non_modifying_colour;
847
    int coding_method, non_modifying_color;
848 848

  
849 849
    object_id = AV_RB16(buf);
850 850
    buf += 2;
......
855 855
        return;
856 856

  
857 857
    coding_method = ((*buf) >> 2) & 3;
858
    non_modifying_colour = ((*buf++) >> 1) & 1;
858
    non_modifying_color = ((*buf++) >> 1) & 1;
859 859

  
860 860
    if (coding_method == 0) {
861 861
        top_field_len = AV_RB16(buf);
......
872 872
            block = buf;
873 873

  
874 874
            dvbsub_parse_pixel_data_block(avctx, display, block, top_field_len, 0,
875
                                            non_modifying_colour);
875
                                            non_modifying_color);
876 876

  
877 877
            if (bottom_field_len > 0)
878 878
                block = buf + top_field_len;
......
880 880
                bottom_field_len = top_field_len;
881 881

  
882 882
            dvbsub_parse_pixel_data_block(avctx, display, block, bottom_field_len, 1,
883
                                            non_modifying_colour);
883
                                            non_modifying_color);
884 884
        }
885 885

  
886 886
/*  } else if (coding_method == 1) {*/
......
1035 1035
    region->clut = *buf++;
1036 1036

  
1037 1037
    if (region->depth == 8)
1038
        region->bgcolour = *buf++;
1038
        region->bgcolor = *buf++;
1039 1039
    else {
1040 1040
        buf += 1;
1041 1041

  
1042 1042
        if (region->depth == 4)
1043
            region->bgcolour = (((*buf++) >> 4) & 15);
1043
            region->bgcolor = (((*buf++) >> 4) & 15);
1044 1044
        else
1045
            region->bgcolour = (((*buf++) >> 2) & 3);
1045
            region->bgcolor = (((*buf++) >> 2) & 3);
1046 1046
    }
1047 1047

  
1048 1048
#ifdef DEBUG
......
1050 1050
#endif
1051 1051

  
1052 1052
    if (fill) {
1053
        memset(region->pbuf, region->bgcolour, region->buf_size);
1053
        memset(region->pbuf, region->bgcolor, region->buf_size);
1054 1054
#ifdef DEBUG
1055
        av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolour);
1055
        av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolor);
1056 1056
#endif
1057 1057
    }
1058 1058

  
......
1085 1085
        buf += 2;
1086 1086

  
1087 1087
        if ((object->type == 1 || object->type == 2) && buf+1 < buf_end) {
1088
            display->fgcolour = *buf++;
1089
            display->bgcolour = *buf++;
1088
            display->fgcolor = *buf++;
1089
            display->bgcolor = *buf++;
1090 1090
        }
1091 1091

  
1092 1092
        display->region_list_next = region->display_list;

Also available in: Unified diff