comparison mjpeg.c @ 3062:8d05d4036b6a libavcodec

Mjpeg interlaced decoding fix, height was wrong while decoding (/2). Patch by Baptiste Coudurier, baptiste _ coudurier at smartjog _ com.

3061:259fed5adf5d

    if (width != s->width || height != s->height) {
        av_freep(&s->qscale_table);

        s->width = width;
        s->height = height;
        avcodec_set_dimensions(s->avctx, width, height);

        /* test interlaced mode */
        if (s->first_picture &&
            s->org_height != 0 &&
            s->height < ((s->org_height * 3) / 4)) {
            s->interlaced = 1;
//            s->bottom_field = (s->interlace_polarity) ? 1 : 0;
            s->bottom_field = 0;
            s->avctx->height *= 2;
        }

        s->qscale_table= av_mallocz((s->width+15)/16);

        s->first_picture = 0;
    }

3062:8d05d4036b6a

    if (width != s->width || height != s->height) {
        av_freep(&s->qscale_table);

        s->width = width;
        s->height = height;

        /* test interlaced mode */
        if (s->first_picture &&
            s->org_height != 0 &&
            s->height < ((s->org_height * 3) / 4)) {
            s->interlaced = 1;
//            s->bottom_field = (s->interlace_polarity) ? 1 : 0;
            s->bottom_field = 0;
            height *= 2;
        }

        avcodec_set_dimensions(s->avctx, width, height);

        s->qscale_table= av_mallocz((s->width+15)/16);

        s->first_picture = 0;
    }