comparison cook.c @ 3091:0284d5b34916 libavcodec

Fix broken cosmetics commit and add a check for valid headers.
author banan
date Mon, 06 Feb 2006 11:21:10 +0000
parents 19260d5b8c39
children 9cbd63cca826
comparison
equal deleted inserted replaced
3090:19260d5b8c39 3091:0284d5b34916
1223 q->js_subband_start = e->js_subband_start; 1223 q->js_subband_start = e->js_subband_start;
1224 q->joint_stereo = 1; 1224 q->joint_stereo = 1;
1225 q->js_vlc_bits = e->js_vlc_bits; 1225 q->js_vlc_bits = e->js_vlc_bits;
1226 } 1226 }
1227 if (q->samples_per_channel > 256) { 1227 if (q->samples_per_channel > 256) {
1228 q->log2_numvector_size = 6 1228 q->log2_numvector_size = 6;
1229 } 1229 }
1230 if (q->samples_per_channel > 512) { 1230 if (q->samples_per_channel > 512) {
1231 q->log2_numvector_size = 7 1231 q->log2_numvector_size = 7;
1232 } 1232 }
1233 break; 1233 break;
1234 case MC_COOK: 1234 case MC_COOK:
1235 av_log(NULL,AV_LOG_ERROR,"MC_COOK not supported!\n"); 1235 av_log(NULL,AV_LOG_ERROR,"MC_COOK not supported!\n");
1236 return -1; 1236 return -1;
1278 av_log(NULL,AV_LOG_ERROR,"total_subbands > 53, report sample!\n"); 1278 av_log(NULL,AV_LOG_ERROR,"total_subbands > 53, report sample!\n");
1279 return -1; 1279 return -1;
1280 } 1280 }
1281 if (q->subbands > 50) { 1281 if (q->subbands > 50) {
1282 av_log(NULL,AV_LOG_ERROR,"subbands > 50, report sample!\n"); 1282 av_log(NULL,AV_LOG_ERROR,"subbands > 50, report sample!\n");
1283 return -1;
1284 }
1285 if ((q->samples_per_channel == 256) || (q->samples_per_channel == 512) || (q->samples_per_channel == 1024)) {
1286 } else {
1287 av_log(NULL,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel);
1283 return -1; 1288 return -1;
1284 } 1289 }
1285 1290
1286 #ifdef COOKDEBUG 1291 #ifdef COOKDEBUG
1287 dump_cook_context(q,e); 1292 dump_cook_context(q,e);