comparison src/ffmpeg/libavcodec/flac.c @ 830:68562d99230f trunk

[svn] - more symbol cleanups.
author nenolod
date Mon, 12 Mar 2007 15:23:10 -0700
parents e8776388b02a
children
comparison
equal deleted inserted replaced
829:1c250e20c6e3 830:68562d99230f
133 for (i = 0; i < s->channels; i++) 133 for (i = 0; i < s->channels; i++)
134 { 134 {
135 s->decoded[i] = av_realloc(s->decoded[i], sizeof(int32_t)*s->max_blocksize); 135 s->decoded[i] = av_realloc(s->decoded[i], sizeof(int32_t)*s->max_blocksize);
136 } 136 }
137 137
138 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); 138 s->bitstream= av_realloc(s->bitstream, s->max_framesize);
139 } 139 }
140 140
141 static void metadata_streaminfo(FLACContext *s) 141 static void metadata_streaminfo(FLACContext *s)
142 { 142 {
143 /* mandatory streaminfo */ 143 /* mandatory streaminfo */
532 int tmp = 0, i, j = 0, input_buf_size = 0; 532 int tmp = 0, i, j = 0, input_buf_size = 0;
533 int16_t *samples = data; 533 int16_t *samples = data;
534 534
535 if(s->max_framesize == 0){ 535 if(s->max_framesize == 0){
536 s->max_framesize= 65536; // should hopefully be enough for the first header 536 s->max_framesize= 65536; // should hopefully be enough for the first header
537 s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); 537 s->bitstream= av_realloc(s->bitstream, s->max_framesize);
538 } 538 }
539 539
540 if(1 && s->max_framesize){//FIXME truncated 540 if(1 && s->max_framesize){//FIXME truncated
541 buf_size= FFMAX(FFMIN(buf_size, s->max_framesize - s->bitstream_size), 0); 541 buf_size= FFMAX(FFMIN(buf_size, s->max_framesize - s->bitstream_size), 0);
542 input_buf_size= buf_size; 542 input_buf_size= buf_size;