comparison h264.c @ 2547:c5781912ad8a libavcodec

improved detection of "AVC1" style H.264 patch by (M���ns Rullg���rd <mru inprovide com>)

2546:621cc4a94695

    s->low_delay= 1;
    avctx->pix_fmt= PIX_FMT_YUV420P;

    decode_init_vlc(h);
    
    if(avctx->codec_tag != 0x31637661 && avctx->codec_tag != 0x31435641) // avc1
        h->is_avc = 0;
    else {
        if((avctx->extradata_size == 0) || (avctx->extradata == NULL)) {
            av_log(avctx, AV_LOG_ERROR, "AVC codec requires avcC data\n");
            return -1;
        }
        h->is_avc = 1;
        h->got_avcC = 0;
    }

    return 0;
}

2547:c5781912ad8a

    s->low_delay= 1;
    avctx->pix_fmt= PIX_FMT_YUV420P;

    decode_init_vlc(h);
    
    if(avctx->extradata_size > 0 && avctx->extradata &&
       *(char *)avctx->extradata == 1){
        av_log(avctx, AV_LOG_INFO, "assuming AVC1 format\n");
        h->is_avc = 1;
        h->got_avcC = 0;
    } else {
        h->is_avc = 0;
    }

    return 0;
}