RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

shorten: skip some fields in the WAV header embedded in the shorten header. 

fixes incorrect bitrate reporting and potential misreporting of the number of
channels.
This commit is contained in:
Justin Ruggles 2011-09-14 15:20:22 -04:00
parent a1f7885a8b
commit 07745485ef
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/shorten.c
View File

@ -231,10 +231,10 @@ static int decode_wave_header(AVCodecContext *avctx, uint8_t *header, int header
return -1;
}
avctx->channels = get_le16(&hb);
skip_bits(&hb, 16); // skip channels (already got from shorten header)
avctx->sample_rate = get_le32(&hb);
avctx->bit_rate = get_le32(&hb) * 8;
avctx->block_align = get_le16(&hb);
skip_bits(&hb, 32); // skip bit rate (represents original uncompressed bit rate)
skip_bits(&hb, 16); // skip block align (not needed)
avctx->bits_per_coded_sample = get_le16(&hb);
if (avctx->bits_per_coded_sample != 16) {
@ -295,6 +295,7 @@ static int read_header(ShortenContext *s)
av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels);
return -1;
}
s->avctx->channels = s->channels;
/* get blocksize if version > 0 */
if (s->version > 0) {