Revision 35f6c154 libavcodec/imgconvert.c

View differences:

libavcodec/imgconvert.c
130 130 
        .depth = 8,
131 131 
        .x_chroma_shift = 0, .y_chroma_shift = 1,
132 132 
    },
133 
    [PIX_FMT_YUV420PLE] = {
134 
        .name = "yuv420ple",
133 
    [PIX_FMT_YUV420P16LE] = {
134 
        .name = "yuv420p16le",
135 135 
        .nb_channels = 3,
136 136 
        .color_type = FF_COLOR_YUV,
137 137 
        .pixel_type = FF_PIXEL_PLANAR,
138 138 
        .depth = 16,
139 139 
        .x_chroma_shift = 1, .y_chroma_shift = 1,
140 140 
    },
141 
    [PIX_FMT_YUV422PLE] = {
142 
        .name = "yuv422ple",
141 
    [PIX_FMT_YUV422P16LE] = {
142 
        .name = "yuv422p16le",
143 143 
        .nb_channels = 3,
144 144 
        .color_type = FF_COLOR_YUV,
145 145 
        .pixel_type = FF_PIXEL_PLANAR,
146 146 
        .depth = 16,
147 147 
        .x_chroma_shift = 1, .y_chroma_shift = 0,
148 148 
    },
149 
    [PIX_FMT_YUV444PLE] = {
150 
        .name = "yuv444ple",
149 
    [PIX_FMT_YUV444P16LE] = {
150 
        .name = "yuv444p16le",
151 151 
        .nb_channels = 3,
152 152 
        .color_type = FF_COLOR_YUV,
153 153 
        .pixel_type = FF_PIXEL_PLANAR,
154 154 
        .depth = 16,
155 155 
        .x_chroma_shift = 0, .y_chroma_shift = 0,
156 156 
    },
157 
    [PIX_FMT_YUV420PBE] = {
158 
        .name = "yuv420pbe",
157 
    [PIX_FMT_YUV420P16BE] = {
158 
        .name = "yuv420p16be",
159 159 
        .nb_channels = 3,
160 160 
        .color_type = FF_COLOR_YUV,
161 161 
        .pixel_type = FF_PIXEL_PLANAR,
162 162 
        .depth = 16,
163 163 
        .x_chroma_shift = 1, .y_chroma_shift = 1,
164 164 
    },
165 
    [PIX_FMT_YUV422PBE] = {
166 
        .name = "yuv422pbe",
165 
    [PIX_FMT_YUV422P16BE] = {
166 
        .name = "yuv422p16be",
167 167 
        .nb_channels = 3,
168 168 
        .color_type = FF_COLOR_YUV,
169 169 
        .pixel_type = FF_PIXEL_PLANAR,
170 170 
        .depth = 16,
171 171 
        .x_chroma_shift = 1, .y_chroma_shift = 0,
172 172 
    },
173 
    [PIX_FMT_YUV444PBE] = {
174 
        .name = "yuv444pbe",
173 
    [PIX_FMT_YUV444P16BE] = {
174 
        .name = "yuv444p16be",
175 175 
        .nb_channels = 3,
176 176 
        .color_type = FF_COLOR_YUV,
177 177 
        .pixel_type = FF_PIXEL_PLANAR,
......
662 662 
        picture->linesize[1] = w2;
663 663 
        picture->linesize[2] = w2;
664 664 
        break;
665 
    case PIX_FMT_YUV420PLE:
666 
    case PIX_FMT_YUV422PLE:
667 
    case PIX_FMT_YUV444PLE:
668 
    case PIX_FMT_YUV420PBE:
669 
    case PIX_FMT_YUV422PBE:
670 
    case PIX_FMT_YUV444PBE:
665 
    case PIX_FMT_YUV420P16LE:
666 
    case PIX_FMT_YUV422P16LE:
667 
    case PIX_FMT_YUV444P16LE:
668 
    case PIX_FMT_YUV420P16BE:
669 
    case PIX_FMT_YUV422P16BE:
670 
    case PIX_FMT_YUV444P16BE:
671 671 
        w2 = (width + (1 << pinfo->x_chroma_shift) - 1) >> pinfo->x_chroma_shift;
672 672 
        picture->linesize[0] = 2*width;
673 673 
        picture->linesize[1] = 2*w2;
......
760 760 
    case PIX_FMT_YUVJ422P:
761 761 
    case PIX_FMT_YUVJ444P:
762 762 
    case PIX_FMT_YUVJ440P:
763 
    case PIX_FMT_YUV420PLE:
764 
    case PIX_FMT_YUV422PLE:
765 
    case PIX_FMT_YUV444PLE:
766 
    case PIX_FMT_YUV420PBE:
767 
    case PIX_FMT_YUV422PBE:
768 
    case PIX_FMT_YUV444PBE:
763 
    case PIX_FMT_YUV420P16LE:
764 
    case PIX_FMT_YUV422P16LE:
765 
    case PIX_FMT_YUV444P16LE:
766 
    case PIX_FMT_YUV420P16BE:
767 
    case PIX_FMT_YUV422P16BE:
768 
    case PIX_FMT_YUV444P16BE:
769 769 
        h2 = (height + (1 << pinfo->y_chroma_shift) - 1) >> pinfo->y_chroma_shift;
770 770 
        size2 = picture->linesize[1] * h2;
771 771 
        picture->data[0] = ptr;

Also available in: Unified diff