mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'
* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c': dcadec: set the output channel mode more accurately. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
bc7f76377c
|
@ -2190,6 +2190,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
|
|||
s->downmix_coef[i][1] = (!code ? 0.0f :
|
||||
sign * dca_dmixtable[code - 1]);
|
||||
}
|
||||
s->output = s->core_downmix_amode;
|
||||
} else {
|
||||
int am = s->amode & DCA_CHANNEL_MASK;
|
||||
if (am >= FF_ARRAY_ELEMS(dca_default_coeffs)) {
|
||||
|
@ -2375,7 +2376,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||
if (s->prim_channels + !!s->lfe > 2 &&
|
||||
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
|
||||
channels = 2;
|
||||
s->output = DCA_STEREO;
|
||||
s->output = s->prim_channels == 2 ? s->amode : DCA_STEREO;
|
||||
avctx->channel_layout = AV_CH_LAYOUT_STEREO;
|
||||
}
|
||||
else if (avctx->request_channel_layout & AV_CH_LAYOUT_NATIVE) {
|
||||
|
|
Loading…
Reference in New Issue