|
|
|
@ -639,7 +639,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) |
|
|
|
|
break; |
|
|
|
|
case CODEC_ID_MSMPEG4V2: |
|
|
|
|
s->out_format = FMT_H263; |
|
|
|
|
s->h263_msmpeg4 = 1; |
|
|
|
|
s->h263_pred = 1; |
|
|
|
|
s->unrestricted_mv = 1; |
|
|
|
|
s->msmpeg4_version= 2; |
|
|
|
@ -648,7 +647,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) |
|
|
|
|
break; |
|
|
|
|
case CODEC_ID_MSMPEG4V3: |
|
|
|
|
s->out_format = FMT_H263; |
|
|
|
|
s->h263_msmpeg4 = 1; |
|
|
|
|
s->h263_pred = 1; |
|
|
|
|
s->unrestricted_mv = 1; |
|
|
|
|
s->msmpeg4_version= 3; |
|
|
|
@ -658,7 +656,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) |
|
|
|
|
break; |
|
|
|
|
case CODEC_ID_WMV1: |
|
|
|
|
s->out_format = FMT_H263; |
|
|
|
|
s->h263_msmpeg4 = 1; |
|
|
|
|
s->h263_pred = 1; |
|
|
|
|
s->unrestricted_mv = 1; |
|
|
|
|
s->msmpeg4_version= 4; |
|
|
|
@ -668,7 +665,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) |
|
|
|
|
break; |
|
|
|
|
case CODEC_ID_WMV2: |
|
|
|
|
s->out_format = FMT_H263; |
|
|
|
|
s->h263_msmpeg4 = 1; |
|
|
|
|
s->h263_pred = 1; |
|
|
|
|
s->unrestricted_mv = 1; |
|
|
|
|
s->msmpeg4_version= 5; |
|
|
|
@ -2771,7 +2767,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) |
|
|
|
|
|
|
|
|
|
/* we need to initialize some time vars before we can encode b-frames */ |
|
|
|
|
// RAL: Condition added for MPEG1VIDEO
|
|
|
|
|
if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) |
|
|
|
|
if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->msmpeg4_version)) |
|
|
|
|
set_frame_distances(s); |
|
|
|
|
if(CONFIG_MPEG4_ENCODER && s->codec_id == CODEC_ID_MPEG4) |
|
|
|
|
ff_set_mpeg4_time(s); |
|
|
|
@ -2940,7 +2936,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) |
|
|
|
|
case FMT_H263: |
|
|
|
|
if (CONFIG_WMV2_ENCODER && s->codec_id == CODEC_ID_WMV2) |
|
|
|
|
ff_wmv2_encode_picture_header(s, picture_number); |
|
|
|
|
else if (CONFIG_MSMPEG4_ENCODER && s->h263_msmpeg4) |
|
|
|
|
else if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) |
|
|
|
|
msmpeg4_encode_picture_header(s, picture_number); |
|
|
|
|
else if (CONFIG_MPEG4_ENCODER && s->h263_pred) |
|
|
|
|
mpeg4_encode_picture_header(s, picture_number); |
|
|
|
|