Fix broken cosmetics commit and add a check for valid headers.
authorBenjamin Larsson <banan@ludd.ltu.se>
Mon, 6 Feb 2006 11:21:10 +0000 (11:21 +0000)
committerBenjamin Larsson <banan@ludd.ltu.se>
Mon, 6 Feb 2006 11:21:10 +0000 (11:21 +0000)
Originally committed as revision 4945 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/cook.c

index b5f7cbf..4140be1 100644 (file)
@@ -1225,10 +1225,10 @@ static int cook_decode_init(AVCodecContext *avctx)
                 q->js_vlc_bits = e->js_vlc_bits;
             }
             if (q->samples_per_channel > 256) {
-                q->log2_numvector_size  = 6
+                q->log2_numvector_size  = 6;
             }
             if (q->samples_per_channel > 512) {
-                q->log2_numvector_size  = 7
+                q->log2_numvector_size  = 7;
             }
             break;
         case MC_COOK:
@@ -1282,6 +1282,11 @@ static int cook_decode_init(AVCodecContext *avctx)
         av_log(NULL,AV_LOG_ERROR,"subbands > 50, report sample!\n");
         return -1;
     }
+    if ((q->samples_per_channel == 256) || (q->samples_per_channel == 512) || (q->samples_per_channel == 1024)) {
+    } else {
+        av_log(NULL,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel);
+        return -1;
+    }
 
 #ifdef COOKDEBUG
     dump_cook_context(q,e);