@@ -640,13 +640,6 @@ retry:
goto retry;
}
- // for skipping the frame
- s->current_picture.f->pict_type = s->pict_type;
- if (s->pict_type == AV_PICTURE_TYPE_I)
- s->current_picture.f->flags |= AV_FRAME_FLAG_KEY;
- else
- s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY;
-
if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) ||
(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) ||
avctx->skip_frame >= AVDISCARD_ALL)
@@ -1326,11 +1326,6 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf,
s->mpeg_f_code[1][0] = f_code;
s->mpeg_f_code[1][1] = f_code;
}
- s->current_picture.f->pict_type = s->pict_type;
- if (s->pict_type == AV_PICTURE_TYPE_I)
- s->current_picture.f->flags |= AV_FRAME_FLAG_KEY;
- else
- s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY;
if (avctx->debug & FF_DEBUG_PICT_INFO)
av_log(avctx, AV_LOG_DEBUG,
@@ -1504,11 +1499,6 @@ static int mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
s->pict_type = AV_PICTURE_TYPE_P;
} else
s->pict_type = AV_PICTURE_TYPE_B;
- s->current_picture.f->pict_type = s->pict_type;
- if (s->pict_type == AV_PICTURE_TYPE_I)
- s->current_picture.f->flags |= AV_FRAME_FLAG_KEY;
- else
- s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY;
}
s->intra_dc_precision = get_bits(&s->gb, 2);
@@ -1058,13 +1058,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict,
goto err;
}
- // for skipping the frame
- s->current_picture.f->pict_type = s->pict_type;
- if (s->pict_type == AV_PICTURE_TYPE_I)
- s->current_picture.f->flags |= AV_FRAME_FLAG_KEY;
- else
- s->current_picture.f->flags &= ~AV_FRAME_FLAG_KEY;
-
/* skip B-frames if we don't have reference frames */
if (!s->last_picture_ptr && s->pict_type == AV_PICTURE_TYPE_B) {
av_log(v->s.avctx, AV_LOG_DEBUG, "Skipping B frame without reference frames\n");
These flags will be overwritten later in ff_mpv_frame_start(). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/h261dec.c | 7 ------- libavcodec/mpeg12dec.c | 10 ---------- libavcodec/vc1dec.c | 7 ------- 3 files changed, 24 deletions(-)