[FFmpeg-cvslog] r12438 - trunk/libavcodec/mpeg12.c

[bcoudurier]

Author: bcoudurier
Date: Fri Mar 14 10:33:38 2008
New Revision: 12438

Log:
log aspect ratio forbidden value, and fail if error resilience is high

Modified:
   trunk/libavcodec/mpeg12.c

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	(original)
+++ trunk/libavcodec/mpeg12.c	Fri Mar 14 10:33:38 2008
@@ -1970,6 +1970,11 @@ static int mpeg1_decode_sequence(AVCodec
         (width % 2) != 0 || (height % 2) != 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");
+        if (avctx->error_resilience >= FF_ER_COMPLIANT)
+            return -1;
+    }
     s->frame_rate_index = get_bits(&s->gb, 4);
     if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
         return -1;