Commit f9aadf1f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e205fe68'

* commit 'e205fe68':
  mpeg4videodec: Fix low_delay error message
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f626eaa5 e205fe68
......@@ -2232,7 +2232,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)) {
av_log(s->avctx, AV_LOG_ERROR, "low_delay flag incorrectly, clearing it\n");
av_log(s->avctx, AV_LOG_ERROR, "low_delay flag set incorrectly, clearing it\n");
s->low_delay = 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment