generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dcadec: silence request_channels deprecation warnings

Browse Source 
This also prevents an eventual compilation failure once request_channels
is removed.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-07-12 03:12:37 -03:00
parent f353b851b9
commit a3b721d10d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/dcadec.c
View File

@ -1669,11 +1669,18 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
/* If we have XXCH then the channel layout is managed differently */ /* If we have XXCH then the channel layout is managed differently */
/* note that XLL will also have another way to do things */ /* note that XLL will also have another way to do things */
#if FF_API_REQUEST_CHANNELS
FF_DISABLE_DEPRECATION_WARNINGS
if (!(s->core_ext_mask & DCA_EXT_XXCH) if (!(s->core_ext_mask & DCA_EXT_XXCH)
|| (s->core_ext_mask & DCA_EXT_XXCH && avctx->request_channels > 0 || (s->core_ext_mask & DCA_EXT_XXCH && avctx->request_channels > 0
&& avctx->request_channels && avctx->request_channels
< num_core_channels + !!s->lfe + s->xxch_chset_nch[0])) < num_core_channels + !!s->lfe + s->xxch_chset_nch[0]))
{ /* xxx should also do MA extensions */ {
FF_ENABLE_DEPRECATION_WARNINGS
#else
if (!(s->core_ext_mask & DCA_EXT_XXCH)) {
#endif
/* xxx should also do MA extensions */
if (s->amode < 16) { if (s->amode < 16) {
avctx->channel_layout = ff_dca_core_channel_layout[s->amode]; avctx->channel_layout = ff_dca_core_channel_layout[s->amode];
@ -1750,6 +1757,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
/* we only get here if an XXCH channel set can be added to the mix */ /* we only get here if an XXCH channel set can be added to the mix */
channel_mask = s->xxch_core_spkmask; channel_mask = s->xxch_core_spkmask;
#if FF_API_REQUEST_CHANNELS
FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->request_channels > 0 if (avctx->request_channels > 0
&& avctx->request_channels < s->prim_channels) { && avctx->request_channels < s->prim_channels) {
channels = num_core_channels + !!s->lfe; channels = num_core_channels + !!s->lfe;
@ -1758,7 +1767,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
channels += s->xxch_chset_nch[i]; channels += s->xxch_chset_nch[i];
channel_mask |= s->xxch_spk_masks[i]; channel_mask |= s->xxch_spk_masks[i];
} }
} else { FF_ENABLE_DEPRECATION_WARNINGS
} else
#endif
{
channels = s->prim_channels + !!s->lfe; channels = s->prim_channels + !!s->lfe;
for (i = 0; i < s->xxch_chset; i++) { for (i = 0; i < s->xxch_chset; i++) {
channel_mask |= s->xxch_spk_masks[i]; channel_mask |= s->xxch_spk_masks[i];