diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-20 12:26:08 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | 65ddc74988245a01421a63c5cffa4d900c47117c (patch) | |
| tree | 72bd32783aca75dff15c038cd0a69d724514b31c /libavformat/demux.c | |
| parent | a12cd3be98e8aba6e74274192ec6532988aa9444 (diff) | |
| download | ffmpeg-65ddc74988245a01421a63c5cffa4d900c47117c.tar.gz | |
avutil: remove deprecated FF_API_OLD_CHANNEL_LAYOUT
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/demux.c')
| -rw-r--r-- | libavformat/demux.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavformat/demux.c b/libavformat/demux.c index 2e1d0ed66d..a0028bfeec 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -199,18 +199,6 @@ static int update_stream_avctx(AVFormatContext *s) sti->parser = NULL; } -#if FF_API_OLD_CHANNEL_LAYOUT -FF_DISABLE_DEPRECATION_WARNINGS - if (st->codecpar->ch_layout.nb_channels && - !st->codecpar->channels) { - st->codecpar->channels = st->codecpar->ch_layout.nb_channels; - st->codecpar->channel_layout = st->codecpar->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? - st->codecpar->ch_layout.u.mask : 0; - - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - /* update internal codec context, for the parser */ ret = avcodec_parameters_to_context(sti->avctx, st->codecpar); if (ret < 0) @@ -1452,13 +1440,6 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) return ret; st->codecpar->sample_rate = sti->avctx->sample_rate; st->codecpar->bit_rate = sti->avctx->bit_rate; -#if FF_API_OLD_CHANNEL_LAYOUT -FF_DISABLE_DEPRECATION_WARNINGS - st->codecpar->channels = sti->avctx->ch_layout.nb_channels; - st->codecpar->channel_layout = sti->avctx->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? - sti->avctx->ch_layout.u.mask : 0; -FF_ENABLE_DEPRECATION_WARNINGS -#endif ret = av_channel_layout_copy(&st->codecpar->ch_layout, &sti->avctx->ch_layout); if (ret < 0) return ret; |