Mercurial > libavcodec.hg

comparison aac_ac3_parser.c @ 6649:f7d73a268ef6 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
indent
author michael
date Sat, 19 Apr 2008 10:48:50 +0000
parents 7ca428109684
children 2d1497d25251
comparison
equal deleted inserted replaced
6648:4b9ae696e5cc 6649:f7d73a268ef6
65 } 65 }
66 66
67 *poutbuf = buf; 67 *poutbuf = buf;
68 *poutbuf_size = buf_size; 68 *poutbuf_size = buf_size;
69 69
70 /* update codec info */ 70 /* update codec info */
71 avctx->sample_rate = s->sample_rate; 71 avctx->sample_rate = s->sample_rate;
72 /* allow downmixing to stereo (or mono for AC3) */ 72 /* allow downmixing to stereo (or mono for AC3) */
73 if(avctx->request_channels > 0 && 73 if(avctx->request_channels > 0 &&
74 avctx->request_channels < s->channels && 74 avctx->request_channels < s->channels &&
75 (avctx->request_channels <= 2 || 75 (avctx->request_channels <= 2 ||
76 (avctx->request_channels == 1 && 76 (avctx->request_channels == 1 &&
77 avctx->codec_id == CODEC_ID_AC3))) { 77 avctx->codec_id == CODEC_ID_AC3))) {
78 avctx->channels = avctx->request_channels; 78 avctx->channels = avctx->request_channels;
79 } else { 79 } else {
80 avctx->channels = s->channels; 80 avctx->channels = s->channels;
81 } 81 }
82 avctx->bit_rate = s->bit_rate; 82 avctx->bit_rate = s->bit_rate;
83 avctx->frame_size = s->samples; 83 avctx->frame_size = s->samples;
84 84
85 return i; 85 return i;
86 } 86 }