[SCM] libav/experimental: Fix broken cosmetics commit and add a check for valid headers.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2e9c78d3547efdcce0082a8b31357c780e84323f
Author: Benjamin Larsson <banan at ludd.ltu.se>
Date:   Mon Feb 6 11:21:10 2006 +0000

    Fix broken cosmetics commit and add a check for valid headers.
    
    Originally committed as revision 4945 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index b5f7cbf..4140be1 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -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);

-- 
Libav/FFmpeg packaging