diff options
| author | Anton Khirnov <anton@khirnov.net> | 2019-05-22 09:07:44 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:39 -0300 |
| commit | b6746b74621798d9b6697cd7369ee41625b375df (patch) | |
| tree | d13575ee3ae43ec2996e96e5b5b7e4e51022be26 /libavformat/demux.c | |
| parent | 4f7c45208e46943cf60a45827114fdf626f45898 (diff) | |
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 <jamrial@gmail.com>
Diffstat (limited to 'libavformat/demux.c')
| -rw-r--r-- | libavformat/demux.c | 12 |
1 files changed, 0 insertions, 12 deletions
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 && |