Mercurial > libavcodec.hg

comparison aac_ac3_parser.c @ 7769:e5f7a43f63ae libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
create a separate codec_id for E-AC-3
author jbr
date Mon, 01 Sep 2008 14:33:54 +0000
parents 1a93d3bbe3ee
children ad95dd08b31a
comparison
equal deleted inserted replaced
7768:152573e499c9 7769:e5f7a43f63ae
74 /* allow downmixing to stereo (or mono for AC-3) */ 74 /* allow downmixing to stereo (or mono for AC-3) */
75 if(avctx->request_channels > 0 && 75 if(avctx->request_channels > 0 &&
76 avctx->request_channels < s->channels && 76 avctx->request_channels < s->channels &&
77 (avctx->request_channels <= 2 || 77 (avctx->request_channels <= 2 ||
78 (avctx->request_channels == 1 && 78 (avctx->request_channels == 1 &&
79 avctx->codec_id == CODEC_ID_AC3))) { 79 (avctx->codec_id == CODEC_ID_AC3 ||
80 avctx->codec_id == CODEC_ID_EAC3)))) {
80 avctx->channels = avctx->request_channels; 81 avctx->channels = avctx->request_channels;
81 } else { 82 } else {
82 avctx->channels = s->channels; 83 avctx->channels = s->channels;
83 } 84 }
84 avctx->bit_rate = s->bit_rate; 85 avctx->bit_rate = s->bit_rate;