diff options
| author | Anton Khirnov <anton@khirnov.net> | 2019-06-04 17:16:02 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:46 -0300 |
| commit | 5636972c7acb5a485e1759db478ded70ee9d3832 (patch) | |
| tree | 2cf11628c865339e88d00bc166c7a229ce931b6f /libavcodec/dcadec.c | |
| parent | bfe86a761a969190ad93781ac5126e8c1742300f (diff) | |
| download | ffmpeg-5636972c7acb5a485e1759db478ded70ee9d3832.tar.gz | |
lavc: drop temporary compat wrappers for channel layout API change
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dcadec.c')
| -rw-r--r-- | libavcodec/dcadec.c | 8 |
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; } |