virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: remove msmpeg4v1 encoder.

Browse Source 
The encoder has never produced files that could be decoded
with any software and there should be no reason to create
such files anyway.
This commit is contained in:
Anton Khirnov 2011-05-13 08:03:36 +02:00
parent 7f3a7b5c40
commit 57aa765971
5 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -262,8 +262,6 @@ OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpegvideo_enc.o \
mpegvideo.o error_resilience.o mpegvideo.o error_resilience.o
OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o
OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \
h263.o ituh263dec.o mpeg4videodec.o
OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \ OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \
h263.o ituh263dec.o mpeg4videodec.o h263.o ituh263dec.o mpeg4videodec.o
OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \ OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \

2
libavcodec/allcodecs.c
View File

@ -147,7 +147,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (MPEGVIDEO, mpegvideo); REGISTER_DECODER (MPEGVIDEO, mpegvideo);
REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau); REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau);
REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau); REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau);
REGISTER_ENCDEC (MSMPEG4V1, msmpeg4v1); REGISTER_DECODER (MSMPEG4V1, msmpeg4v1);
REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2); REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);
REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3); REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3);
REGISTER_DECODER (MSRLE, msrle); REGISTER_DECODER (MSRLE, msrle);

21
libavcodec/mpegvideo_enc.c
View File

@ -637,15 +637,6 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
s->low_delay= s->max_b_frames ? 0 : 1; s->low_delay= s->max_b_frames ? 0 : 1;
avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1); avctx->delay= s->low_delay ? 0 : (s->max_b_frames + 1);
break; break;
case CODEC_ID_MSMPEG4V1:
s->out_format = FMT_H263;
s->h263_msmpeg4 = 1;
s->h263_pred = 1;
s->unrestricted_mv = 1;
s->msmpeg4_version= 1;
avctx->delay=0;
s->low_delay=1;
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_msmpeg4 = 1;
@ -3805,18 +3796,6 @@ AVCodec ff_h263p_encoder = {
.long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
}; };
AVCodec ff_msmpeg4v1_encoder = {
"msmpeg4v1",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_MSMPEG4V1,
sizeof(MpegEncContext),
MPV_encode_init,
MPV_encode_picture,
MPV_encode_end,
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
.long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
};
AVCodec ff_msmpeg4v2_encoder = { AVCodec ff_msmpeg4v2_encoder = {
"msmpeg4v2", "msmpeg4v2",
AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_VIDEO,

8
libavcodec/msmpeg4.c
View File

@ -846,13 +846,6 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr
int pred, extquant; int pred, extquant;
int extrabits = 0; int extrabits = 0;
if(s->msmpeg4_version==1){
int32_t *dc_val;
pred = msmpeg4v1_pred_dc(s, n, &dc_val);
/* update predictor */
*dc_val= level;
}else{
int16_t *dc_val; int16_t *dc_val;
pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr); pred = msmpeg4_pred_dc(s, n, &dc_val, dir_ptr);
@ -862,7 +855,6 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr
} else { } else {
*dc_val = level * s->c_dc_scale; *dc_val = level * s->c_dc_scale;
} }
}
/* do the prediction */ /* do the prediction */
level -= pred; level -= pred;

3
libavcodec/msmpeg4.h
View File

@ -54,8 +54,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
CONFIG_MSMPEG4V3_DECODER || \ CONFIG_MSMPEG4V3_DECODER || \
CONFIG_WMV2_DECODER || \ CONFIG_WMV2_DECODER || \
CONFIG_VC1_DECODER) CONFIG_VC1_DECODER)
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \ #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \
CONFIG_MSMPEG4V2_ENCODER || \
CONFIG_MSMPEG4V3_ENCODER || \ CONFIG_MSMPEG4V3_ENCODER || \
CONFIG_WMV2_ENCODER) CONFIG_WMV2_ENCODER)