diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 21:01:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-01 21:01:33 +0200 |
| commit | f9aadf1fc426412e94c06f5d34516c8dba73cd6a (patch) | |
| tree | 45919764cf89a713fe9a6f7ca10ee577503ae1b5 | |
| parent | f626eaa58e69532ff85044007b2ceb3ce8dd5ed2 (diff) | |
| parent | e205fe6831fe1b5445f7827b5c916425620b4ab5 (diff) | |
| download | ffmpeg-f9aadf1fc426412e94c06f5d34516c8dba73cd6a.tar.gz | |
Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'
* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
mpeg4videodec: Fix low_delay error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 5a36c17543..31bc67bb63 100644 --- 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; } |