Mercurial > libavcodec.hg
comparison mpegaudiodec.c @ 431:1dd34dba2b7c libavcodec
removed invalid buffer handling
author | bellard |
---|---|
date | Sun, 26 May 2002 14:41:53 +0000 |
parents | 718a22dc121f |
children | 000aeeac27a2 |
comparison
equal
deleted
inserted
replaced
430:c38d57874acf | 431:1dd34dba2b7c |
---|---|
1131 break; | 1131 break; |
1132 } | 1132 } |
1133 } | 1133 } |
1134 s->sample_rate = sample_rate; | 1134 s->sample_rate = sample_rate; |
1135 | 1135 |
1136 #ifdef DEBUG | 1136 #if defined(DEBUG) |
1137 printf("layer%d, %d Hz, %d kbits/s, ", | 1137 printf("layer%d, %d Hz, %d kbits/s, ", |
1138 s->layer, s->sample_rate, s->bit_rate); | 1138 s->layer, s->sample_rate, s->bit_rate); |
1139 if (s->nb_channels == 2) { | 1139 if (s->nb_channels == 2) { |
1140 if (s->layer == 3) { | 1140 if (s->layer == 3) { |
1141 if (s->mode_ext & MODE_EXT_MS_STEREO) | 1141 if (s->mode_ext & MODE_EXT_MS_STEREO) |
2457 if (s->frame_size > MPA_MAX_CODED_FRAME_SIZE) | 2457 if (s->frame_size > MPA_MAX_CODED_FRAME_SIZE) |
2458 s->frame_size = MPA_MAX_CODED_FRAME_SIZE; | 2458 s->frame_size = MPA_MAX_CODED_FRAME_SIZE; |
2459 len = s->frame_size - len; | 2459 len = s->frame_size - len; |
2460 if (len > buf_size) | 2460 if (len > buf_size) |
2461 len = buf_size; | 2461 len = buf_size; |
2462 else if (len < 4) | |
2463 len = buf_size > 4 ? 4 : buf_size; | |
2464 memcpy(s->inbuf_ptr, buf_ptr, len); | 2462 memcpy(s->inbuf_ptr, buf_ptr, len); |
2465 buf_ptr += len; | 2463 buf_ptr += len; |
2466 s->inbuf_ptr += len; | 2464 s->inbuf_ptr += len; |
2467 buf_size -= len; | 2465 buf_size -= len; |
2468 } else { | 2466 } else { |