generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dca: return error if the frame header is invalid

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-27 11:42:23 -04:00
parent f44059d260
commit aae6eead6a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/dca.c
View File

@ -1637,7 +1637,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
int lfe_samples; int lfe_samples;
int num_core_channels = 0; int num_core_channels = 0;
int i; int i, ret;
float *samples_flt = data; float *samples_flt = data;
int16_t *samples_s16 = data; int16_t *samples_s16 = data;
int out_size; int out_size;
@ -1656,10 +1656,9 @@ static int dca_decode_frame(AVCodecContext * avctx,
} }
init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8); init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8);
if (dca_parse_frame_header(s) < 0) { if ((ret = dca_parse_frame_header(s)) < 0) {
//seems like the frame is corrupt, try with the next one //seems like the frame is corrupt, try with the next one
*data_size=0; return ret;
return buf_size;
} }
//set AVCodec values with parsed data //set AVCodec values with parsed data
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;