diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-01-18 21:41:44 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-01-18 21:41:44 +0000 |
| commit | 2c492e94fc9d8a5e998b25f4d0390c95f2d4674f (patch) | |
| tree | e011f94a9a3c97f6b04b7aee48e53c7f5b3af245 /libavcodec/mpegvideo.c | |
| parent | 8e78482542c0f0a8fdb9271925c99021b3ee4317 (diff) | |
| download | ffmpeg-2c492e94fc9d8a5e998b25f4d0390c95f2d4674f.tar.gz | |
removing broken framerate conversation hack in mpeg1/2
Originally committed as revision 2713 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index ce9efb26b9..af8626faf2 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -940,7 +940,7 @@ int MPV_encode_init(AVCodecContext *avctx) default: return -1; } - + { /* set up some save defaults, some codecs might override them later */ static int done=0; if(!done){ @@ -1026,7 +1026,6 @@ int MPV_encode_init(AVCodecContext *avctx) s->picture_number = 0; s->input_picture_number = 0; s->picture_in_gop_number = 0; - s->fake_picture_number = 0; /* motion detector init */ s->f_code = 1; s->b_code = 1; @@ -5227,29 +5226,7 @@ static const AVOption mpeg4_options[] = }; #ifdef CONFIG_ENCODERS - -AVCodec mpeg1video_encoder = { - "mpeg1video", - CODEC_TYPE_VIDEO, - CODEC_ID_MPEG1VIDEO, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, -}; - #ifdef CONFIG_RISKY - -AVCodec mpeg2video_encoder = { - "mpeg2video", - CODEC_TYPE_VIDEO, - CODEC_ID_MPEG2VIDEO, - sizeof(MpegEncContext), - MPV_encode_init, - MPV_encode_picture, - MPV_encode_end, -}; - AVCodec h263_encoder = { "h263", CODEC_TYPE_VIDEO, |