--- /intelh263d-revBASE.svn004.tmp.c	So Dez 26 20:00:11 2010
+++ /libavcodec/intelh263dec.c	So Dez 26 19:58:44 2010
@@ -46,7 +46,7 @@
     skip_bits1(&s->gb);         /* freeze picture release off */
 
     format = get_bits(&s->gb, 3);
-    if (format != 7) {
+    if (format == 0 || format == 6) {
         av_log(s->avctx, AV_LOG_ERROR, "Intel H263 free format not supported\n");
         return -1;
     }
@@ -64,6 +64,11 @@
     s->obmc= get_bits1(&s->gb);
     s->pb_frame = get_bits1(&s->gb);
 
+    if (format < 6) {
+        s->width = h263_format[format][0];
+        s->height = h263_format[format][1];
+        s->avctx->sample_aspect_ratio.num=12;s->avctx->sample_aspect_ratio.den=11;
+    }
     if(format == 7){
         format = get_bits(&s->gb, 3);
         if(format == 0 || format == 7){
@@ -88,9 +93,14 @@
         skip_bits1(&s->gb);
         skip_bits(&s->gb, 9); // display height
         if(ar == 15){
-            skip_bits(&s->gb, 8); // aspect ratio - width
-            skip_bits(&s->gb, 8); // aspect ratio - height
+            s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 8); // aspect ratio - width
+            s->avctx->sample_aspect_ratio.den = get_bits(&s->gb, 8); // aspect ratio - height
         }
+        else {
+            s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[ar];
+        }
+        if(s->avctx->sample_aspect_ratio.num == 0)
+            av_log(s->avctx, AV_LOG_ERROR, "Invalid aspect ratio\n");
     }
 
     s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);