From 359fa0febc878066cbb31102e1ee709374054015 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 6 Nov 2004 19:11:34 +0000 Subject: cbr audio muxing fix Originally committed as revision 3661 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/pcm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'libavcodec/pcm.c') diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 4c999b4302..13a16e7475 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -127,6 +127,23 @@ static int pcm_encode_init(AVCodecContext *avctx) break; } + switch(avctx->codec->id) { + case CODEC_ID_PCM_S16LE: + case CODEC_ID_PCM_S16BE: + case CODEC_ID_PCM_U16LE: + case CODEC_ID_PCM_U16BE: + avctx->block_align = 2 * avctx->channels; + break; + case CODEC_ID_PCM_S8: + case CODEC_ID_PCM_U8: + case CODEC_ID_PCM_MULAW: + case CODEC_ID_PCM_ALAW: + avctx->block_align = avctx->channels; + break; + default: + break; + } + avctx->coded_frame= avcodec_alloc_frame(); avctx->coded_frame->key_frame= 1; -- cgit v1.2.3