"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavcodec/dcadec.c" between
libav-12.tar.gz and libav-12.1.tar.gz

About: libav provides cross-platform tools ("avconv") and libraries to convert, manipulate and stream a wide range of multimedia (audio and video) formats and protocols.

dcadec.c  (libav-12):dcadec.c  (libav-12.1)
skipping to change at line 1299 skipping to change at line 1299
} else { } else {
channels = num_core_channels + !!s->lfe; channels = num_core_channels + !!s->lfe;
s->xch_present = 0; /* disable further xch processing */ s->xch_present = 0; /* disable further xch processing */
if (s->lfe) { if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY; avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
s->channel_order_tab = ff_dca_channel_reorder_lfe[s->amode]; s->channel_order_tab = ff_dca_channel_reorder_lfe[s->amode];
} else } else
s->channel_order_tab = ff_dca_channel_reorder_nolfe[s->amode]; s->channel_order_tab = ff_dca_channel_reorder_nolfe[s->amode];
} }
if (channels < ff_dca_channels[s->amode] + !!s->lfe)
return AVERROR_INVALIDDATA;
if (channels > !!s->lfe && if (channels > !!s->lfe &&
s->channel_order_tab[channels - 1 - !!s->lfe] < 0) s->channel_order_tab[channels - 1 - !!s->lfe] < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (num_core_channels + !!s->lfe > 2 && if (num_core_channels + !!s->lfe > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
channels = 2; channels = 2;
s->output = s->audio_header.prim_channels == 2 ? s->amod e : DCA_STEREO; s->output = s->audio_header.prim_channels == 2 ? s->amod e : DCA_STEREO;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS