diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 15:31:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 15:31:00 +0100 |
| commit | 878e5bd6f555ad6167abacb30d66e47aabcdd745 (patch) | |
| tree | 50c5a10137197ae3142ed6f44ea5c2ac794492fe /libavcodec/mpeg12.c | |
| parent | 7a6beedd3fcd1ff0fc3f314cb5ec58db116d19ee (diff) | |
| download | ffmpeg-878e5bd6f555ad6167abacb30d66e47aabcdd745.tar.gz | |
mpeg12: Support decoding dimensions that are a multiple of 4096
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 5ca9bb8d90..d8e22a26af 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2001,8 +2001,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, width = get_bits(&s->gb, 12); height = get_bits(&s->gb, 12); - if (width <= 0 || height <= 0) - return -1; 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"); @@ -2312,6 +2310,11 @@ static int decode_chunks(AVCodecContext *avctx, break; case PICTURE_START_CODE: + if (s2->width <= 0 || s2->height <= 0) { + av_log(avctx, AV_LOG_ERROR, "%dx%d is invalid\n", s2->width, s2->height); + return AVERROR_INVALIDDATA; + } + if(s->tmpgexs){ s2->intra_dc_precision= 3; s2->intra_matrix[0]= 1; |