diff options
| author | Calcium <calcium@nurs.or.jp> | 2005-03-23 12:35:27 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-23 12:35:27 +0000 |
| commit | 58d2a1506d7d777eac7f81f2e1969b12038b6103 (patch) | |
| tree | 79f497833b1aa220a8e90eb99212e179d6ba5c7a /libavformat | |
| parent | 59fa3f96f48d12e189492ca3670991f91c316d4e (diff) | |
28_fix_parameters_in_G726.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4070 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/wav.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c index c96bab42a0..d1f1bc65c9 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -65,7 +65,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) bps = 8; } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { bps = 0; - } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS) { + } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726) { // bps = 4; } else { bps = 16; @@ -74,6 +74,8 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { blkalign = enc->frame_size; //this is wrong, but seems many demuxers dont work if this is set correctly //blkalign = 144 * enc->bit_rate/enc->sample_rate; + } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { // + blkalign = 1; } else if (enc->block_align != 0) { /* specified by the codec */ blkalign = enc->block_align; } else |