Fix segault

[frescor/ffmpeg.git] / libavcodec / vp5.c

diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 61155b47894a6be4a308e9436afdc2494b32dae8..1f8434c731db408356f4189dda3e34f47dca1d03 100644 (file)
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -1,5 +1,5 @@
 /**
- * @file vp5.c
+ * @file libavcodec/vp5.c
  * VP5 compatible video decoder
  *
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vp56.h"
 #include "vp56data.h"
@@ -58,12 +58,14 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
         vp56_rac_gets(c, 8);  /* number of displayed macroblock rows */
         vp56_rac_gets(c, 8);  /* number of displayed macroblock cols */
         vp56_rac_gets(c, 2);
-        if (16*cols != s->avctx->coded_width ||
+        if (!s->macroblocks || /* first frame */
+            16*cols != s->avctx->coded_width ||
             16*rows != s->avctx->coded_height) {
             avcodec_set_dimensions(s->avctx, 16*cols, 16*rows);
             return 2;
         }
-    }
+    } else if (!s->macroblocks)
+        return 0;
     return 1;
 }
 
@@ -87,7 +89,7 @@ static int vp5_adjust(int v, int t)
 static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
 {
     VP56RangeCoder *c = &s->c;
-    Vp56Model *model = s->modelp;
+    VP56Model *model = s->modelp;
     int comp, di;
 
     for (comp=0; comp<2; comp++) {
@@ -111,7 +113,7 @@ static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
 static void vp5_parse_vector_models(VP56Context *s)
 {
     VP56RangeCoder *c = &s->c;
-    Vp56Model *model = s->modelp;
+    VP56Model *model = s->modelp;
     int comp, node;
 
     for (comp=0; comp<2; comp++) {
@@ -134,7 +136,7 @@ static void vp5_parse_vector_models(VP56Context *s)
 static void vp5_parse_coeff_models(VP56Context *s)
 {
     VP56RangeCoder *c = &s->c;
-    Vp56Model *model = s->modelp;
+    VP56Model *model = s->modelp;
     uint8_t def_prob[11];
     int node, cg, ctx;
     int ct;    /* code type */
@@ -180,7 +182,7 @@ static void vp5_parse_coeff_models(VP56Context *s)
 static void vp5_parse_coeff(VP56Context *s)
 {
     VP56RangeCoder *c = &s->c;
-    Vp56Model *model = s->modelp;
+    VP56Model *model = s->modelp;
     uint8_t *permute = s->scantable.permutated;
     uint8_t *model1, *model2;
     int coeff, sign, coeff_idx;
@@ -252,7 +254,7 @@ static void vp5_parse_coeff(VP56Context *s)
 
 static void vp5_default_models_init(VP56Context *s)
 {
-    Vp56Model *model = s->modelp;
+    VP56Model *model = s->modelp;
     int i;
 
     for (i=0; i<2; i++) {