Revision 47e1d7ef libavformat/mov.c

View differences:

libavformat/mov.c
648 648
    int entries, frames_per_sample;
649 649
    uint32_t format;
650 650
    uint8_t codec_name[32];
651

  
652
    /* for palette traversal */
653 651
    unsigned int color_depth;
654
    unsigned int color_start;
655
    unsigned int color_count;
656
    unsigned int color_end;
657
    int color_index;
658
    int color_dec;
659 652
    int color_greyscale;
660
    const uint8_t *color_table;
661 653
    int j, pseudo_stream_id;
662
    unsigned char r, g, b;
663 654

  
664 655
    get_byte(pb); /* version */
665 656
    get_be24(pb); /* flags */
......
752 743
            /* if the depth is 2, 4, or 8 bpp, file is palettized */
753 744
            if ((color_depth == 2) || (color_depth == 4) ||
754 745
                (color_depth == 8)) {
746
                /* for palette traversal */
747
                unsigned int color_start, color_count, color_end;
748
                unsigned char r, g, b;
749

  
755 750
                if (color_greyscale) {
751
                    int color_index, color_dec;
756 752
                    /* compute the greyscale palette */
757 753
                    st->codec->bits_per_sample = color_depth;
758 754
                    color_count = 1 << color_depth;
......
767 763
                            color_index = 0;
768 764
                    }
769 765
                } else if (st->codec->color_table_id) {
766
                    const uint8_t *color_table;
770 767
                    /* if flag bit 3 is set, use the default palette */
771 768
                    color_count = 1 << color_depth;
772 769
                    if (color_depth == 2)

Also available in: Unified diff