comparison mjpegdec.c @ 5818:e0a872dd3ea1 libavcodec

Fix MJPEG decoder for AMV files. Since decoding is doing from the end and aligned by 16 previous code worked correctly only when picture height was dividable by 16, otherwise it provides garbage in top lines and truncates bottom. New code adjusts data[] pointers taking in account alignment issue.

5817:ced30500e2b1

        int c = s->comp_index[i];
        data[c] = s->picture.data[c];
        linesize[c]=s->linesize[c];
        if(s->avctx->codec->id==CODEC_ID_AMV) {
            //picture should be flipped upside-down for this codec
            data[c] += (linesize[c] * (s->v_scount[i] * 8 * s->mb_height - 1));
            linesize[c] *= -1;
        }
    }

    for(mb_y = 0; mb_y < s->mb_height; mb_y++) {

5818:e0a872dd3ea1

        int c = s->comp_index[i];
        data[c] = s->picture.data[c];
        linesize[c]=s->linesize[c];
        if(s->avctx->codec->id==CODEC_ID_AMV) {
            //picture should be flipped upside-down for this codec
            assert(!(s->avctx->flags & CODEC_FLAG_EMU_EDGE));
            data[c] += (linesize[c] * (s->v_scount[i] * (8 * s->mb_height -((s->height/s->v_max)&7)) - 1 ));
            linesize[c] *= -1;
        }
    }

    for(mb_y = 0; mb_y < s->mb_height; mb_y++) {