aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-13 09:59:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-13 11:24:46 +0200
commitf153dfc9e44f6f1d26ebeb032b66f09279efabad (patch)
tree17047b954b6f0e3013f1d64cb6960a08e6651cae
parent1caf614bec297c7e6c5f115d3ba6663d0e682e8e (diff)
downloadffmpeg-f153dfc9e44f6f1d26ebeb032b66f09279efabad.tar.gz
h263enc: test that dimensions are a multiple of 4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpegvideo_enc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index a10421cecc..cba7d9d9a2 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -487,6 +487,13 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "H.263 does not support resolutions above 2048x1152\n");
return -1;
}
+ if ((s->codec_id == CODEC_ID_H263 ||
+ s->codec_id == CODEC_ID_H263P) &&
+ ((avctx->width &3) ||
+ (avctx->height&3) )) {
+ av_log(avctx, AV_LOG_ERROR, "w/h must be a multiple of 4\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) {