summaryrefslogtreecommitdiff
path: root/libavcodec/dcadec.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/dcadec.c')
-rw-r--r--libavcodec/dcadec.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 3fc9b35699..ad56554f46 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -79,14 +79,6 @@ int ff_dca_set_channel_layout(AVCodecContext *avctx, int *ch_remap, int dca_mask
av_channel_layout_from_mask(&avctx->ch_layout, wav_mask);
}
-#if FF_API_OLD_CHANNEL_LAYOUT
-FF_DISABLE_DEPRECATION_WARNINGS
- avctx->channels = avctx->ch_layout.nb_channels;
- avctx->channel_layout = avctx->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ?
- avctx->ch_layout.u.mask : 0;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
return nchannels;
}