[FFmpeg-cvslog] mpeg2enc: check input dimensions
Michael Niedermayer
git at videolan.org
Sun May 13 11:26:21 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 13 11:12:20 2012 +0200| [6b0a0dc555e77b376c4a543d73ec295f2c651210] | committer: Michael Niedermayer
mpeg2enc: check input dimensions
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b0a0dc555e77b376c4a543d73ec295f2c651210
---
libavcodec/mpegvideo_enc.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 1fffcca..88b1777 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -502,6 +502,12 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
return -1;
}
+ if (s->codec_id == CODEC_ID_MPEG2VIDEO &&
+ (avctx->width > 16383 ||
+ avctx->height > 16383 )) {
+ av_log(avctx, AV_LOG_ERROR, "MPEG-2 does not support resolutions above 16383x16383\n");
+ return -1;
+ }
if ((s->flags & (CODEC_FLAG_INTERLACED_DCT | CODEC_FLAG_INTERLACED_ME)) &&
s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO) {
av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");
More information about the ffmpeg-cvslog
mailing list