[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec cook.c,1.7,1.8

[Benjamin Larsson CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv11582

Modified Files:
	cook.c 
Log Message:
Fix broken cosmetics commit and add a check for valid headers.


Index: cook.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/cook.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cook.c	6 Feb 2006 11:03:37 -0000	1.7
+++ cook.c	6 Feb 2006 11:21:10 -0000	1.8
@@ -1225,10 +1225,10 @@
                 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 @@
         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);