[FFmpeg-cvslog] mpeg1enc: 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:11:56 2012 +0200| [d5df0df848be473e06ace48ecec223ef1c389644] | committer: Michael Niedermayer
mpeg1enc: check input dimensions
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5df0df848be473e06ace48ecec223ef1c389644
---
libavcodec/mpegvideo_enc.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index cba7d9d..1fffcca 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -495,6 +495,13 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
return -1;
}
+ if (s->codec_id == CODEC_ID_MPEG1VIDEO &&
+ (avctx->width > 4095 ||
+ avctx->height > 4095 )) {
+ av_log(avctx, AV_LOG_ERROR, "MPEG-1 does not support resolutions above 4095x4095\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