mpegvideo: Drop flags and flags2

They are just duplicates of AVCodecContext members so use those instead.
This commit is contained in:
Vittorio Giovara
2015-04-27 19:13:25 +01:00
parent 29216d7fd1
commit 848e86f74d
22 changed files with 117 additions and 125 deletions
+2 -2
View File
@@ -2078,7 +2078,7 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb)
s->pict_type = get_bits(gb, 2) + AV_PICTURE_TYPE_I; /* pict type: I = 0 , P = 1 */
if (s->pict_type == AV_PICTURE_TYPE_B && s->low_delay &&
ctx->vol_control_parameters == 0 && !(s->flags & CODEC_FLAG_LOW_DELAY)) {
ctx->vol_control_parameters == 0 && !(s->avctx->flags & CODEC_FLAG_LOW_DELAY)) {
av_log(s->avctx, AV_LOG_ERROR, "low_delay flag set incorrectly, clearing it\n");
s->low_delay = 0;
}
@@ -2420,7 +2420,7 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
}
end:
if (s->flags & CODEC_FLAG_LOW_DELAY)
if (s->avctx->flags & CODEC_FLAG_LOW_DELAY)
s->low_delay = 1;
s->avctx->has_b_frames = !s->low_delay;