comparison rv10.c @ 712:e55b91623e09 libavcodec

fixing rv10, this isnt the cleanest solution (parsing the packet header in the codec & creating it in the muxer) but it was that way before things broke, and its the simplest solution

711:dcbcf9676c9f

}

/* write RV 1.0 compatible frame header */
void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
{
    int full_frame= 1;

    align_put_bits(&s->pb);
    
    if(full_frame){
        put_bits(&s->pb, 8, 0xc0);	/* packet header */
        put_bits(&s->pb, 16, 0x4000);	/* len */
        put_bits(&s->pb, 16, 0x4000);	/* pos */
    }

    put_bits(&s->pb, 8, picture_number&0xFF);
    
    put_bits(&s->pb, 1, 1);	/* marker */

    put_bits(&s->pb, 1, (s->pict_type == P_TYPE));

static int rv10_decode_picture_header(MpegEncContext *s)
{
    int mb_count, pb_frame, marker, h, full_frame;
    int pic_num, unk;
    
    /* skip packet header */
    h = get_bits(&s->gb, 8);
    if ((h & 0xc0) == 0xc0) {
        int len, pos;
        full_frame = 1;

712:e55b91623e09

}

/* write RV 1.0 compatible frame header */
void rv10_encode_picture_header(MpegEncContext *s, int picture_number)
{
    int full_frame= 0;

    align_put_bits(&s->pb);
    
    put_bits(&s->pb, 1, 1);	/* marker */

    put_bits(&s->pb, 1, (s->pict_type == P_TYPE));

static int rv10_decode_picture_header(MpegEncContext *s)
{
    int mb_count, pb_frame, marker, h, full_frame;
    int pic_num, unk;
    
    //XXX/FIXME this should be done in the demuxer not here
    /* skip packet header */
    h = get_bits(&s->gb, 8);
    if ((h & 0xc0) == 0xc0) {
        int len, pos;
        full_frame = 1;