comparison imgconvert.c @ 1052:f529b09e64b7 libavcodec

Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images when this conversion was used. I suspect that the same bug may be lurking in other conversions. [The assumption was that the linesize was equal to the width for both the source and destination images. This turns out not to be true in some cases.]

1051:e5a9dbf597d4

                                                                        \
    lum = dst->data[0];                                                 \
    cb = dst->data[1];                                                  \
    cr = dst->data[2];                                                  \
                                                                        \
    wrap = width;                                                       \
    wrap3 = width * BPP;                                                \
    p = src->data[0];                                                   \
    for(y=0;y<height;y+=2) {                                            \
        for(x=0;x<width;x+=2) {                                         \
            RGB_IN(r, g, b, p);                                         \
            r1 = r;                                                     \

            cb++;                                                       \
            cr++;                                                       \
            p += -wrap3 + 2 * BPP;                                      \
            lum += -wrap + 2;                                           \
        }                                                               \
        p += wrap3;                                                     \
        lum += wrap;                                                    \
    }                                                                   \
}                                                                       \
                                                                        \
static void rgb_name ## _to_gray(AVPicture *dst, AVPicture *src,        \
                                 int width, int height)                 \

1052:f529b09e64b7

                                                                        \
    lum = dst->data[0];                                                 \
    cb = dst->data[1];                                                  \
    cr = dst->data[2];                                                  \
                                                                        \
    wrap = dst->linesize[0];                                            \
    wrap3 = src->linesize[0];                                           \
    p = src->data[0];                                                   \
    for(y=0;y<height;y+=2) {                                            \
        for(x=0;x<width;x+=2) {                                         \
            RGB_IN(r, g, b, p);                                         \
            r1 = r;                                                     \

            cb++;                                                       \
            cr++;                                                       \
            p += -wrap3 + 2 * BPP;                                      \
            lum += -wrap + 2;                                           \
        }                                                               \
        p += wrap3 + (wrap3 - width * BPP);                             \
        lum += wrap + (wrap - width);                                   \
        cb += dst->linesize[1] - width / 2;                             \
        cr += dst->linesize[2] - width / 2;                             \
    }                                                                   \
}                                                                       \
                                                                        \
static void rgb_name ## _to_gray(AVPicture *dst, AVPicture *src,        \
                                 int width, int height)                 \