Commit 2e9c78d3 authored by Benjamin Larsson's avatar Benjamin Larsson
Browse files

Fix broken cosmetics commit and add a check for valid headers.

Originally committed as revision 4945 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7f129a33
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment