comparison h263.c @ 322:ce35fd27bbb0 libavcodec

- Versions defined for libav/libavcodec. - Bug fix in wav muxer for MP2 audio. - ffmpeg/libavcodec version in MPEG-4 user data.

321:2b00e171b1d4

}

static void mpeg4_encode_vol_header(MpegEncContext * s)
{
    int vo_ver_id=1; //must be 2 if we want GMC or q-pel

    if(get_bit_count(&s->pb)!=0) mpeg4_stuffing(&s->pb);
    put_bits(&s->pb, 16, 0);
    put_bits(&s->pb, 16, 0x100);        /* video obj */
    put_bits(&s->pb, 16, 0);
    put_bits(&s->pb, 16, 0x120);        /* video obj layer */

    put_bits(&s->pb, 1, 0);		/* scalability */

    mpeg4_stuffing(&s->pb);
    put_bits(&s->pb, 16, 0);
    put_bits(&s->pb, 16, 0x1B2);	/* user_data */
    put_string(&s->pb, "ffmpeg"); //FIXME append some version ...

    s->no_rounding = 0;
}

/* write mpeg4 VOP header */

322:ce35fd27bbb0

}

static void mpeg4_encode_vol_header(MpegEncContext * s)
{
    int vo_ver_id=1; //must be 2 if we want GMC or q-pel
    char buf[255];
    
    if(get_bit_count(&s->pb)!=0) mpeg4_stuffing(&s->pb);
    put_bits(&s->pb, 16, 0);
    put_bits(&s->pb, 16, 0x100);        /* video obj */
    put_bits(&s->pb, 16, 0);
    put_bits(&s->pb, 16, 0x120);        /* video obj layer */

    put_bits(&s->pb, 1, 0);		/* scalability */

    mpeg4_stuffing(&s->pb);
    put_bits(&s->pb, 16, 0);
    put_bits(&s->pb, 16, 0x1B2);	/* user_data */
    sprintf(buf, "FFmpeg v%s / libavcodec build: %s", FFMPEG_VERSION, LIBAVCODEC_BUILD_STR);
    put_string(&s->pb, buf);

    s->no_rounding = 0;
}

/* write mpeg4 VOP header */