Mercurial > libavformat.hg

changeset 713:3c8a21cd6296 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
28_fix_parameters_in_G726.patch by (Calcium | calcium nurs or jp)
author michael
date Wed, 23 Mar 2005 12:35:27 +0000
parents 31e58b79ed02
children 3086560254cd
files wav.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/wav.c	Wed Mar 23 11:20:47 2005 +0000
+++ b/wav.c	Wed Mar 23 12:35:27 2005 +0000
@@ -65,7 +65,7 @@
         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 @@
     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