comparison 4xm.c @ 5611:c94931b2f2e5 libavcodec

Change 4xm demuxer and video decoder to pass the video format version in extradata instead of codec_tag.

5610:a9eb858ecee4

}

static int decode_init(AVCodecContext *avctx){
    FourXContext * const f = avctx->priv_data;

    f->version= avctx->codec_tag == 0x40000;
    common_init(avctx);
    init_vlcs(f);

    if(f->version) avctx->pix_fmt= PIX_FMT_RGB565;
    else           avctx->pix_fmt= PIX_FMT_RGB555;

5611:c94931b2f2e5

}

static int decode_init(AVCodecContext *avctx){
    FourXContext * const f = avctx->priv_data;

    if(avctx->extradata_size != 4 || !avctx->extradata) {
        av_log(avctx, AV_LOG_ERROR, "extradata wrong or missing\n");
        return 1;
    }

    f->version= AV_RL32(avctx->extradata) == 0x40000;
    common_init(avctx);
    init_vlcs(f);

    if(f->version) avctx->pix_fmt= PIX_FMT_RGB565;
    else           avctx->pix_fmt= PIX_FMT_RGB555;