comparison mpegvideo.c @ 5029:dbaa06366c3c libavcodec

add a proper prefix to all mjpeg encoder exported functions

5028:3d8a813666e4

        s->mjpeg_vsample[1] = 2>>chroma_v_shift;
        s->mjpeg_vsample[2] = 2>>chroma_v_shift;
        s->mjpeg_hsample[0] = 2;
        s->mjpeg_hsample[1] = 2>>chroma_h_shift;
        s->mjpeg_hsample[2] = 2>>chroma_h_shift;
        if (!(ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) || mjpeg_init(s) < 0)
            return -1;
        avctx->delay=0;
        s->low_delay=1;
        break;
    case CODEC_ID_H261:

    ff_rate_control_uninit(s);

    MPV_common_end(s);
    if ((ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) && s->out_format == FMT_MJPEG)
        mjpeg_close(s);

    av_freep(&avctx->extradata);

    return 0;
}

        avctx->skip_count  = s->skip_count;

        MPV_frame_end(s);

        if (ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG)
            mjpeg_picture_trailer(s);

        if(avctx->rc_buffer_size){
            RateControlContext *rcc= &s->rc_context;
            int max_size= rcc->buffer_index/3;

    case CODEC_ID_RV10:
    case CODEC_ID_RV20:
        h263_encode_mb(s, s->block, motion_x, motion_y); break;
    case CODEC_ID_MJPEG:
        if (ENABLE_MJPEG_ENCODER)
            mjpeg_encode_mb(s, s->block);
        break;
    default:
        assert(0);
    }
}

            ff_mpeg4_merge_partitions(s);
        }

        ff_mpeg4_stuffing(&s->pb);
    }else if(ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG){
        ff_mjpeg_stuffing(&s->pb);
    }

    align_put_bits(&s->pb);
    flush_put_bits(&s->pb);

    s->last_bits= put_bits_count(&s->pb);
    switch(s->out_format) {
    case FMT_MJPEG:
        if (ENABLE_MJPEG_ENCODER)
            mjpeg_picture_header(s);
        break;
    case FMT_H261:
        if (ENABLE_H261_ENCODER)
            ff_h261_encode_picture_header(s, picture_number);
        break;

5029:dbaa06366c3c

        s->mjpeg_vsample[1] = 2>>chroma_v_shift;
        s->mjpeg_vsample[2] = 2>>chroma_v_shift;
        s->mjpeg_hsample[0] = 2;
        s->mjpeg_hsample[1] = 2>>chroma_h_shift;
        s->mjpeg_hsample[2] = 2>>chroma_h_shift;
        if (!(ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER)
            || ff_mjpeg_encode_init(s) < 0)
            return -1;
        avctx->delay=0;
        s->low_delay=1;
        break;
    case CODEC_ID_H261:

    ff_rate_control_uninit(s);

    MPV_common_end(s);
    if ((ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) && s->out_format == FMT_MJPEG)
        ff_mjpeg_encode_close(s);

    av_freep(&avctx->extradata);

    return 0;
}

        avctx->skip_count  = s->skip_count;

        MPV_frame_end(s);

        if (ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG)
            ff_mjpeg_encode_picture_trailer(s);

        if(avctx->rc_buffer_size){
            RateControlContext *rcc= &s->rc_context;
            int max_size= rcc->buffer_index/3;

    case CODEC_ID_RV10:
    case CODEC_ID_RV20:
        h263_encode_mb(s, s->block, motion_x, motion_y); break;
    case CODEC_ID_MJPEG:
        if (ENABLE_MJPEG_ENCODER)
            ff_mjpeg_encode_mb(s, s->block);
        break;
    default:
        assert(0);
    }
}

            ff_mpeg4_merge_partitions(s);
        }

        ff_mpeg4_stuffing(&s->pb);
    }else if(ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG){
        ff_mjpeg_encode_stuffing(&s->pb);
    }

    align_put_bits(&s->pb);
    flush_put_bits(&s->pb);

    s->last_bits= put_bits_count(&s->pb);
    switch(s->out_format) {
    case FMT_MJPEG:
        if (ENABLE_MJPEG_ENCODER)
            ff_mjpeg_encode_picture_header(s);
        break;
    case FMT_H261:
        if (ENABLE_H261_ENCODER)
            ff_h261_encode_picture_header(s, picture_number);
        break;