aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-18 17:48:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-18 17:48:52 +0100
commit0163ad66e124a3ba1984a9e99a9fcdb624a52730 (patch)
tree4c45e225288271752048d490d56ea67bfad8323b
parent330e440706665d91f36f180f25fa096a8b3e7ed4 (diff)
downloadffmpeg-0163ad66e124a3ba1984a9e99a9fcdb624a52730.tar.gz
mpeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_COMPLIANT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpeg12.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 3f5548d6dd..ebabd732c5 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2029,7 +2029,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
if (width == 0 || height == 0) {
av_log(avctx, AV_LOG_WARNING, "Invalid horizontal or vertical size "
"value.\n");
- if (avctx->err_recognition & AV_EF_BITSTREAM)
+ if (avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_COMPLIANT))
return AVERROR_INVALIDDATA;
}
s->aspect_ratio_info = get_bits(&s->gb, 4);