From 2bfdb34c8a61c96042752dac18499ce8381c1e69 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Fri, 12 Aug 2011 01:30:20 -0400 Subject: [PATCH] mpeg12: remove repeat-field code disabled since May 2002 Signed-off-by: Diego Biurrun --- avconv.c | 2 -- ffmpeg.c | 2 -- libavcodec/mpeg12.c | 12 ------------ 3 files changed, 16 deletions(-) diff --git a/avconv.c b/avconv.c index 74db59f..9df4779 100644 --- a/avconv.c +++ b/avconv.c @@ -2295,8 +2295,6 @@ static int transcode(AVFormatContext **output_files, } assert_codec_experimental(ist->st->codec, 0); assert_avoptions(ost->opts); - //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - // ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD; } } diff --git a/ffmpeg.c b/ffmpeg.c index 079384b..1443dd3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2391,8 +2391,6 @@ static int transcode(AVFormatContext **output_files, } assert_codec_experimental(ist->st->codec, 0); assert_avoptions(ost->opts); - //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - // ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD; } } diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index cb3b815..91eb3f5 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2260,18 +2260,6 @@ static int mpeg_decode_frame(AVCodecContext *avctx, return buf_size; } -#if 0 - if (s->repeat_field % 2 == 1) { - s->repeat_field++; - //fprintf(stderr,"\nRepeating last frame: %d -> %d! pict: %d %d", avctx->frame_number-1, avctx->frame_number, - // s2->picture_number, s->repeat_field); - if (avctx->flags & CODEC_FLAG_REPEAT_FIELD) { - *data_size = sizeof(AVPicture); - goto the_end; - } - } -#endif - if(s->mpeg_enc_ctx_allocated==0 && avctx->codec_tag == AV_RL32("VCR2")) vcr2_init_sequence(avctx); -- 2.7.4