Mercurial > libavformat.hg

comparison riff.c @ 3906:b3a0c732d0d7 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set default bps to 16 in wav header
author bcoudurier
date Sun, 07 Sep 2008 04:17:15 +0000
parents 5554c668388b
children 1d3d17de20ba
comparison
equal deleted inserted replaced
3905:91987686113d 3906:b3a0c732d0d7
246 if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) { 246 if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) {
247 bps = 0; 247 bps = 0;
248 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { // 248 } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { //
249 bps = 4; 249 bps = 4;
250 } else { 250 } else {
251 bps = av_get_bits_per_sample(enc->codec_id); 251 if (!(bps = av_get_bits_per_sample(enc->codec_id)))
252 bps = 16; // default to 16
252 } 253 }
253 if(bps != enc->bits_per_sample && enc->bits_per_sample){ 254 if(bps != enc->bits_per_sample && enc->bits_per_sample){
254 av_log(enc, AV_LOG_WARNING, "requested bits_per_sample (%d) and actually stored (%d) differ\n", enc->bits_per_sample, bps); 255 av_log(enc, AV_LOG_WARNING, "requested bits_per_sample (%d) and actually stored (%d) differ\n", enc->bits_per_sample, bps);
255 } 256 }
256 257