From b6746b74621798d9b6697cd7369ee41625b375df Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 22 May 2019 09:07:44 +0200 Subject: lavf: drop the channel layout compat layer for old-style (de)muxers All the (de)muxers have been converted to the new API. Signed-off-by: James Almer --- libavformat/demux.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'libavformat/demux.c') diff --git a/libavformat/demux.c b/libavformat/demux.c index e43140c855..f7ebba2474 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -194,18 +194,6 @@ static int update_stream_avctx(AVFormatContext *s) sti->parser = NULL; } - /* if the demuxer exports old channel layouts, convert it to new */ - if (!st->codecpar->ch_layout.nb_channels && - st->codecpar->channels) { - if (st->codecpar->channel_layout) { - av_channel_layout_from_mask(&st->codecpar->ch_layout, - st->codecpar->channel_layout); - } else { - st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - st->codecpar->ch_layout.nb_channels = st->codecpar->channels; - } - } - #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS if (st->codecpar->ch_layout.nb_channels && -- cgit v1.2.3