virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

flacdec: change frame bps validation to return an error value if bps

Browse Source 
changes since this is not currently supported by the decoder.

Originally committed as revision 18157 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-03-22 22:10:33 +00:00
parent f91eaf5deb
commit e2a38af96e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/flacdec.c
View File

@ -512,25 +512,26 @@ static int decode_frame(FLACContext *s)
/* bits per sample */
bps_code = get_bits(gb, 3);
if (bps_code == 0) {
bps= s->bps;
} else if ((bps_code != 3) && (bps_code != 7)) {
bps = sample_size_table[bps_code];
} else {
if (bps_code == 3 || bps_code == 7) {
av_log(s->avctx, AV_LOG_ERROR, "invalid sample size code (%d)\n",
bps_code);
return -1;
}
if (bps > 16) {
bps = sample_size_table[bps_code];
if (bps && bps != s->bps) {
av_log(s->avctx, AV_LOG_ERROR, "switching bps mid-stream is not "
"supported\n");
return -1;
}
if (s->bps > 16) {
s->avctx->sample_fmt = SAMPLE_FMT_S32;
s->sample_shift = 32 - bps;
s->sample_shift = 32 - s->bps;
s->is32 = 1;
} else {
s->avctx->sample_fmt = SAMPLE_FMT_S16;
s->sample_shift = 16 - bps;
s->sample_shift = 16 - s->bps;
s->is32 = 0;
}
s->bps = s->avctx->bits_per_raw_sample = bps;
/* reserved bit */
if (get_bits1(gb)) {