virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 4945 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benjamin Larsson 2006-02-06 11:21:10 +00:00
parent 7f129a33b1
commit 2e9c78d354
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/cook.c
View File

@ -1225,10 +1225,10 @@ static int cook_decode_init(AVCodecContext *avctx)
q->js_vlc_bits = e->js_vlc_bits; q->js_vlc_bits = e->js_vlc_bits;
} }
if (q->samples_per_channel > 256) { if (q->samples_per_channel > 256) {
q->log2_numvector_size = 6 q->log2_numvector_size = 6;
} }
if (q->samples_per_channel > 512) { if (q->samples_per_channel > 512) {
q->log2_numvector_size = 7 q->log2_numvector_size = 7;
} }
break; break;
case MC_COOK: 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"); av_log(NULL,AV_LOG_ERROR,"subbands > 50, report sample!\n");
return -1; 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 #ifdef COOKDEBUG
dump_cook_context(q,e); dump_cook_context(q,e);