diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-19 03:12:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-19 04:07:26 +0100 |
| commit | b0ccebe448ecf0351b773ea3c1796866f834dca8 (patch) | |
| tree | bbd7937e53591a82893740c7ecc1961e23b84279 /libavcodec/mpeg12.c | |
| parent | 7fbe87c079d3b6b2da21942b9fe4c133f8ad6e66 (diff) | |
| download | ffmpeg-b0ccebe448ecf0351b773ea3c1796866f834dca8.tar.gz | |
mpeg12dec: correct AV_EF flags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 3bc857dc5f..53857482ea 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1364,7 +1364,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) { s->full_pel[0] = get_bits1(&s->gb); f_code = get_bits(&s->gb, 3); - if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM)) + if (f_code == 0 && (avctx->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))) return -1; s->mpeg_f_code[0][0] = f_code; s->mpeg_f_code[0][1] = f_code; @@ -1372,7 +1372,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, if (s->pict_type == AV_PICTURE_TYPE_B) { s->full_pel[1] = get_bits1(&s->gb); f_code = get_bits(&s->gb, 3); - if (f_code == 0 && (avctx->err_recognition & AV_EF_BITSTREAM)) + if (f_code == 0 && (avctx->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))) return -1; s->mpeg_f_code[1][0] = f_code; s->mpeg_f_code[1][1] = f_code; @@ -1804,7 +1804,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/; if (left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10) - || ((avctx->err_recognition & AV_EF_BUFFER) && left > 8)) { + || ((avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_AGGRESSIVE)) && left > 8)) { av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23))); return -1; } else @@ -1984,7 +1984,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, s->aspect_ratio_info = get_bits(&s->gb, 4); if (s->aspect_ratio_info == 0) { av_log(avctx, AV_LOG_ERROR, "aspect ratio has forbidden 0 value\n"); - if (avctx->err_recognition & AV_EF_BITSTREAM) + if (avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_COMPLIANT)) return -1; } s->frame_rate_index = get_bits(&s->gb, 4); |