comparison mpegvideo.c @ 298:e20de99b6295 libavcodec

using Juanjo's way to pass forced type - especially as I_TYPE/P_TYPE defines aren't exported in the public interface, and the flagged method matches the way as qscale forcing work

297:a1234c032636

    if (s->fixed_qscale) 
        s->qscale = avctx->quality;

    init_put_bits(&s->pb, buf, buf_size, NULL, NULL);

    s->force_type= avctx->force_type;
    if (!s->intra_only) {
        /* first picture of GOP is intra */
        if (s->picture_in_gop_number % s->gop_size==0 || s->force_type==I_TYPE){
            s->picture_in_gop_number=0;
            s->pict_type = I_TYPE;

298:e20de99b6295

    if (s->fixed_qscale) 
        s->qscale = avctx->quality;

    init_put_bits(&s->pb, buf, buf_size, NULL, NULL);

    s->force_type= (avctx->flags&CODEC_FLAG_TYPE) ?
	(avctx->key_frame ? I_TYPE : P_TYPE) : 0;
    if (!s->intra_only) {
        /* first picture of GOP is intra */
        if (s->picture_in_gop_number % s->gop_size==0 || s->force_type==I_TYPE){
            s->picture_in_gop_number=0;
            s->pict_type = I_TYPE;