Commit 8c51620f authored by Alex Converse's avatar Alex Converse
Browse files

Remove h263_msmpeg4 from MpegEncContext.

It was long ago superseded by msmpeg4_version.
parent 19a686b8
...@@ -69,33 +69,27 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) ...@@ -69,33 +69,27 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
break; break;
case CODEC_ID_MSMPEG4V1: case CODEC_ID_MSMPEG4V1:
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->msmpeg4_version=1; s->msmpeg4_version=1;
break; break;
case CODEC_ID_MSMPEG4V2: case CODEC_ID_MSMPEG4V2:
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->msmpeg4_version=2; s->msmpeg4_version=2;
break; break;
case CODEC_ID_MSMPEG4V3: case CODEC_ID_MSMPEG4V3:
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->msmpeg4_version=3; s->msmpeg4_version=3;
break; break;
case CODEC_ID_WMV1: case CODEC_ID_WMV1:
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->msmpeg4_version=4; s->msmpeg4_version=4;
break; break;
case CODEC_ID_WMV2: case CODEC_ID_WMV2:
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->msmpeg4_version=5; s->msmpeg4_version=5;
break; break;
case CODEC_ID_VC1: case CODEC_ID_VC1:
case CODEC_ID_WMV3: case CODEC_ID_WMV3:
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->msmpeg4_version=6; s->msmpeg4_version=6;
avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
...@@ -655,7 +649,7 @@ retry: ...@@ -655,7 +649,7 @@ retry:
decode_slice(s); decode_slice(s);
} }
if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==AV_PICTURE_TYPE_I) if (s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type==AV_PICTURE_TYPE_I)
if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){ if(!CONFIG_MSMPEG4_DECODER || msmpeg4_decode_ext_header(s, buf_size) < 0){
s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR; s->error_status_table[s->mb_num-1]= AC_ERROR|DC_ERROR|MV_ERROR;
} }
......
...@@ -1986,7 +1986,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64], ...@@ -1986,7 +1986,7 @@ void MPV_decode_mb_internal(MpegEncContext *s, DCTELEM block[12][64],
} }
/* add dct residue */ /* add dct residue */
if(s->encoding || !( s->h263_msmpeg4 || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO if(s->encoding || !( s->msmpeg4_version || s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO
|| (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){ || (s->codec_id==CODEC_ID_MPEG4 && !s->mpeg_quant))){
add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
......
...@@ -207,7 +207,6 @@ typedef struct MpegEncContext { ...@@ -207,7 +207,6 @@ typedef struct MpegEncContext {
/* the following codec id fields are deprecated in favor of codec_id */ /* the following codec id fields are deprecated in favor of codec_id */
int h263_plus; ///< h263 plus headers int h263_plus; ///< h263 plus headers
int h263_msmpeg4; ///< generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)
int h263_flv; ///< use flv h263 header int h263_flv; ///< use flv h263 header
enum CodecID codec_id; /* see CODEC_ID_xxx */ enum CodecID codec_id; /* see CODEC_ID_xxx */
...@@ -831,4 +830,3 @@ void ff_wmv2_encode_mb(MpegEncContext * s, ...@@ -831,4 +830,3 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
int motion_x, int motion_y); int motion_x, int motion_y);
#endif /* AVCODEC_MPEGVIDEO_H */ #endif /* AVCODEC_MPEGVIDEO_H */
...@@ -639,7 +639,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -639,7 +639,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break; break;
case CODEC_ID_MSMPEG4V2: case CODEC_ID_MSMPEG4V2:
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->msmpeg4_version= 2; s->msmpeg4_version= 2;
...@@ -648,7 +647,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -648,7 +647,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break; break;
case CODEC_ID_MSMPEG4V3: case CODEC_ID_MSMPEG4V3:
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->msmpeg4_version= 3; s->msmpeg4_version= 3;
...@@ -658,7 +656,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -658,7 +656,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break; break;
case CODEC_ID_WMV1: case CODEC_ID_WMV1:
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->msmpeg4_version= 4; s->msmpeg4_version= 4;
...@@ -668,7 +665,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) ...@@ -668,7 +665,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
break; break;
case CODEC_ID_WMV2: case CODEC_ID_WMV2:
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->h263_msmpeg4 = 1;
s->h263_pred = 1; s->h263_pred = 1;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->msmpeg4_version= 5; s->msmpeg4_version= 5;
...@@ -2771,7 +2767,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) ...@@ -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 */ /* we need to initialize some time vars before we can encode b-frames */
// RAL: Condition added for MPEG1VIDEO // 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); set_frame_distances(s);
if(CONFIG_MPEG4_ENCODER && s->codec_id == CODEC_ID_MPEG4) if(CONFIG_MPEG4_ENCODER && s->codec_id == CODEC_ID_MPEG4)
ff_set_mpeg4_time(s); ff_set_mpeg4_time(s);
...@@ -2940,7 +2936,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) ...@@ -2940,7 +2936,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
case FMT_H263: case FMT_H263:
if (CONFIG_WMV2_ENCODER && s->codec_id == CODEC_ID_WMV2) if (CONFIG_WMV2_ENCODER && s->codec_id == CODEC_ID_WMV2)
ff_wmv2_encode_picture_header(s, picture_number); 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); msmpeg4_encode_picture_header(s, picture_number);
else if (CONFIG_MPEG4_ENCODER && s->h263_pred) else if (CONFIG_MPEG4_ENCODER && s->h263_pred)
mpeg4_encode_picture_header(s, picture_number); mpeg4_encode_picture_header(s, picture_number);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment