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 | |
| parent | 4f7c45208e46943cf60a45827114fdf626f45898 (diff) | |
| download | ffmpeg-b6746b74621798d9b6697cd7369ee41625b375df.tar.gz | |
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>
| -rw-r--r-- | libavformat/demux.c | 12 | ||||
| -rw-r--r-- | libavformat/mux.c | 9 |
2 files changed, 0 insertions, 21 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 && diff --git a/libavformat/mux.c b/libavformat/mux.c index 53be37d3c4..80ee555c38 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -273,15 +273,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) goto fail; } - /* if the new-style channel layout is set, convert it to old one - * for old-style muxers */ - if (par->ch_layout.nb_channels && - !par->channels) { - par->channels = par->ch_layout.nb_channels; - par->channel_layout = par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? - par->ch_layout.u.mask : 0; - } - #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS /* if the caller is using the deprecated channel layout API, |