[FFmpeg-cvslog] r20861 - trunk/libavcodec/mpegvideo_enc.c

[michael]

Author: michael
Date: Mon Dec 14 12:34:46 2009
New Revision: 20861

Log:
Check sample_aspect_ratio validity for mpeg4/h263/h263p encoding.

Modified:
   trunk/libavcodec/mpegvideo_enc.c

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	Mon Dec 14 12:18:28 2009	(r20860)
+++ trunk/libavcodec/mpegvideo_enc.c	Mon Dec 14 12:34:46 2009	(r20861)
@@ -395,6 +395,14 @@ av_cold int MPV_encode_init(AVCodecConte
         return -1;
     }
 
+    if ((s->codec_id == CODEC_ID_MPEG4 || s->codec_id == CODEC_ID_H263 ||
+         s->codec_id == CODEC_ID_H263P) &&
+        (avctx->sample_aspect_ratio.num > 255 || avctx->sample_aspect_ratio.den > 255)) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid pixel aspect ratio %i/%i, limit is 255/255\n",
+               avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);
+        return -1;
+    }
+
     if((s->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN))
        && s->codec_id != CODEC_ID_MPEG4 && s->codec_id != CODEC_ID_MPEG2VIDEO){
         av_log(avctx, AV_LOG_ERROR, "interlacing not supported by codec\n");