diff options
author | Dustin Brody <libav@parsoma.net> | 2011-08-12 01:30:20 -0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-08-15 13:03:20 +0200 |
commit | 2bfdb34c8a61c96042752dac18499ce8381c1e69 (patch) | |
tree | e36924de45504c1753abd9f41ac5e2f4743b29b2 | |
parent | 2dbdb309ac957059cfe5a4e9e13b7423d70bd89b (diff) | |
download | ffmpeg-2bfdb34c8a61c96042752dac18499ce8381c1e69.tar.gz |
mpeg12: remove repeat-field code disabled since May 2002
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r-- | avconv.c | 2 | ||||
-rw-r--r-- | ffmpeg.c | 2 | ||||
-rw-r--r-- | libavcodec/mpeg12.c | 12 |
3 files changed, 0 insertions, 16 deletions
@@ -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; } } @@ -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 cb3b815a1b..91eb3f5ece 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); |