Revision d0271e8a libavcodec/mpegvideo.c

View differences:

libavcodec/mpegvideo.c
1120 1120
        avctx->delay=0;
1121 1121
        s->low_delay=1;
1122 1122
        break;
1123
    case CODEC_ID_RV20:
1124
        s->out_format = FMT_H263;
1125
        avctx->delay=0;
1126
        s->low_delay=1;
1127
        s->modified_quant=1;
1128
        s->h263_aic=1;
1129
        s->h263_plus=1;
1130
        s->loop_filter=1;
1131
        s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
1132
        break;
1123 1133
    case CODEC_ID_MPEG4:
1124 1134
        s->out_format = FMT_H263;
1125 1135
        s->h263_pred = 1;
......
4150 4160
    case CODEC_ID_H263P:
4151 4161
    case CODEC_ID_FLV1:
4152 4162
    case CODEC_ID_RV10:
4163
    case CODEC_ID_RV20:
4153 4164
        h263_encode_mb(s, s->block, motion_x, motion_y); break;
4154 4165
#endif
4155 4166
    case CODEC_ID_MJPEG:
......
4175 4186
    }
4176 4187
    s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL;
4177 4188
    
4189
    s->mb_x= s->mb_y= 0;
4190
    
4178 4191
    s->parse_context.state= -1;
4179 4192
    s->parse_context.frame_start_found= 0;
4180 4193
    s->parse_context.overread= 0;
......
5255 5268
            mpeg4_encode_picture_header(s, picture_number);
5256 5269
        else if (s->codec_id == CODEC_ID_RV10) 
5257 5270
            rv10_encode_picture_header(s, picture_number);
5271
        else if (s->codec_id == CODEC_ID_RV20) 
5272
            rv20_encode_picture_header(s, picture_number);
5258 5273
        else if (s->codec_id == CODEC_ID_FLV1)
5259 5274
            ff_flv_encode_picture_header(s, picture_number);
5260 5275
        else
......
6379 6394
    MPV_encode_end,
6380 6395
};
6381 6396

  
6397
AVCodec rv20_encoder = {
6398
    "rv20",
6399
    CODEC_TYPE_VIDEO,
6400
    CODEC_ID_RV20,
6401
    sizeof(MpegEncContext),
6402
    MPV_encode_init,
6403
    MPV_encode_picture,
6404
    MPV_encode_end,
6405
};
6406

  
6382 6407
AVCodec mpeg4_encoder = {
6383 6408
    "mpeg4",
6384 6409
    CODEC_TYPE_VIDEO,

Also available in: Unified diff