cavsdec: check for changing w/h.
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Mar 2012 01:40:24 +0000 (02:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Mar 2012 02:26:52 +0000 (03:26 +0100)
Our decoder does not support changing w/h.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavsdec.c

index 6e5539c..daebda2 100644 (file)
@@ -609,12 +609,19 @@ static int decode_pic(AVSContext *h) {
 static int decode_seq_header(AVSContext *h) {
     MpegEncContext *s = &h->s;
     int frame_rate_code;
+    int width, height;
 
     h->profile =         get_bits(&s->gb,8);
     h->level =           get_bits(&s->gb,8);
     skip_bits1(&s->gb); //progressive sequence
-    s->width =           get_bits(&s->gb,14);
-    s->height =          get_bits(&s->gb,14);
+       width =           get_bits(&s->gb,14);
+       height =          get_bits(&s->gb,14);
+    if ((s->width || s->height) && (s->width != width || s->height != height)) {
+        av_log_missing_feature(s, "Width/height changing in CAVS is", 0);
+        return -1;
+    }
+    s->width  = width;
+    s->height = height;
     skip_bits(&s->gb,2); //chroma format
     skip_bits(&s->gb,3); //sample_precision
     h->aspect_ratio =    get_bits(&s->gb,4);