← Back to branch summary

~ubuntu-branches/ubuntu/feisty/avidemux/feisty

« back to all changes in this revision

Viewing changes to adm_lavcodec/pcm.c

  • Committer: Bazaar Package Importer
  • Author(s): Christian Marillat
  • Date: 2005-05-25 13:02:29 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050525130229-jw94cav0yhmg7vjw
Tags: 1:2.0.40-0.0
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
adm_lavcodec/pcm.c
127
127
        break;
128
128
    }
129
129
    
 
130
    switch(avctx->codec->id) {
 
131
    case CODEC_ID_PCM_S16LE:
 
132
    case CODEC_ID_PCM_S16BE:
 
133
    case CODEC_ID_PCM_U16LE:
 
134
    case CODEC_ID_PCM_U16BE:
 
135
        avctx->block_align = 2 * avctx->channels;
 
136
        break;
 
137
    case CODEC_ID_PCM_S8:
 
138
    case CODEC_ID_PCM_U8:
 
139
    case CODEC_ID_PCM_MULAW:
 
140
    case CODEC_ID_PCM_ALAW:
 
141
        avctx->block_align = avctx->channels;
 
142
        break;
 
143
    default:
 
144
        break;
 
145
    }
 
146
 
130
147
    avctx->coded_frame= avcodec_alloc_frame();
131
148
    avctx->coded_frame->key_frame= 1;
132
149