Mercurial > libavcodec.hg
comparison liba52.c @ 6115:98be2e14e5d6 libavcodec
do not set channels before checking request_channels
author | jbr |
---|---|
date | Sat, 05 Jan 2008 16:47:40 +0000 |
parents | f6b691720c7d |
children | b568fe642948 |
comparison
equal
deleted
inserted
replaced
6114:f6b691720c7d | 6115:98be2e14e5d6 |
---|---|
184 /* update codec info */ | 184 /* update codec info */ |
185 avctx->sample_rate = sample_rate; | 185 avctx->sample_rate = sample_rate; |
186 s->channels = ac3_channels[s->flags & 7]; | 186 s->channels = ac3_channels[s->flags & 7]; |
187 if (s->flags & A52_LFE) | 187 if (s->flags & A52_LFE) |
188 s->channels++; | 188 s->channels++; |
189 avctx->channels = s->channels; | |
190 if (avctx->request_channels > 0 && | 189 if (avctx->request_channels > 0 && |
191 avctx->request_channels <= 2 && | 190 avctx->request_channels <= 2 && |
192 avctx->request_channels < s->channels) { | 191 avctx->request_channels < s->channels) { |
193 avctx->channels = avctx->request_channels; | 192 avctx->channels = avctx->request_channels; |
193 } else { | |
194 avctx->channels = s->channels; | |
194 } | 195 } |
195 avctx->bit_rate = bit_rate; | 196 avctx->bit_rate = bit_rate; |
196 } | 197 } |
197 } | 198 } |
198 } else if (len < s->frame_size) { | 199 } else if (len < s->frame_size) { |