From 5636972c7acb5a485e1759db478ded70ee9d3832 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 4 Jun 2019 17:16:02 +0200 Subject: lavc: drop temporary compat wrappers for channel layout API change Signed-off-by: James Almer --- libavcodec/dcadec.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libavcodec/dcadec.c') 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; } -- cgit v1.2.3