Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'

* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5': mpeg4videodec: Fix low_delay error message Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · f9aadf1fc4
parent f626eaa58e e205fe6831
commit f9aadf1fc4
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@ -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;
    }